From b1cddd9f60e1262766cc04e132c3cb818055ab8c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 25 May 2019 02:51:00 -0700 Subject: [PATCH] minor Signed-off-by: Jeff Carr --- Makefile | 2 +- main.go | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 3d5265e..7a5e5f6 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ json-readable: cat ~/.config/cloud-control-panel.json |jq -r --tab json-restore: - cp resources/jcarr.json ~/.config/cloud-control-panel.json + cp resources/protobuf-config.json ~/.config/cloud-control-panel.json json-test: cp resources/test.json ~/.config/cloud-control-panel.json diff --git a/main.go b/main.go index 34290bc..3390607 100644 --- a/main.go +++ b/main.go @@ -184,7 +184,7 @@ func mainMouseClick(b *gui.ButtonMap) { log.Println("\tEntryName =", username) log.Println("\tEntryPass =", password) - acc := new(pb.Config_Account) + acc := new(pb.Account) acc.Nick = nick acc.Username = username acc.Password = password @@ -308,26 +308,18 @@ func watchGUI() { time.Sleep(200 * time.Millisecond) if (gui.Data.State == "SEND WEBSOCKET") { - log.Println("\tTRIGGERING WEBSOCKET HERE on AccNick =") - log.Println("\tTRIGGERING WEBSOCKET HERE on AccNick =") - log.Println("\tTRIGGERING WEBSOCKET HERE on AccNick =") - event := pb.MakeGetEvent() event.Token = getToken() - log.Println("\tTRIGGERING WEBSOCKET HERE with event.Token =", event.Token) + log.Println("\tTRIGGERING WEBSOCKET pb.MakeGetEvent() event.Token =", event.Token) gorillaSendProtobuf(event) gui.Data.State = "READ PROTOBUF" } if (gui.Data.State == "SEND LOGIN") { - log.Println("\tTRIGGERING LOGIN HERE on AccNick =") - log.Println("\tTRIGGERING LOGIN HERE on AccNick =") - log.Println("\tTRIGGERING LOGIN HERE on AccNick =") - event := pb.MakeLoginEvent() event.Token = getToken() event.Username = gui.Data.Current.Username - log.Println("\tTRIGGERING LOGIN HERE with event.Token =", event.Token) + log.Println("\tTRIGGERING LOGIN HERE pb.MakeLoginEvent() event.Token =", event.Token) gorillaSendProtobuf(event) gui.Data.State = "READ PROTOBUF" }