From 0a2c8bc86c9378fdf909ca524e65264f53cf3ea6 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 20 May 2020 07:54:52 -0400 Subject: [PATCH] fix rebase conflict --- src/nim_status_client.nim | 10 +++++++--- src/onboarding.nim | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index e08f489d3c..a0059fdc34 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -70,8 +70,12 @@ proc mainProc() = var appState = state.newAppState() debug "Application State", title=appState.title - var accounts = status_test.setupNewAccount() - debug "Accounts", accounts0 = parseJSON(accounts)[0], accounts1 = parseJSON(accounts)[1] + # var accounts = status_test.setupNewAccount() + # echo "---------" + # echo parseJSON(accounts)[0] + # echo parseJSON(accounts)[1] + # echo "---------" + # discard status_test.setupNewAccount() events.on("node:ready") do(a: Args): status_chat.startMessenger() @@ -106,7 +110,7 @@ proc mainProc() = # discard qmlRegisterSingletonType[LibStatusQml]("im.status.desktop.Status", 1, 0, "Status", initLibStatusQml) var profile = profile.newController() - profile.init(accounts) # TODO: use correct account + # profile.init(accounts) # TODO: use correct account engine.setRootContextProperty("profileModel", profile.variant) signalController.init() diff --git a/src/onboarding.nim b/src/onboarding.nim index ee6e537d40..08cd763497 100644 --- a/src/onboarding.nim +++ b/src/onboarding.nim @@ -137,7 +137,7 @@ QtObject: echo "Account saved succesfully" proc generateRandomAccountAndLogin*(self: Onboarding) {.slot.} = - status_test.setupNewAccount() + discard status_test.setupNewAccount() self.events.emit("node:ready", Args())