From 01182c8aeed75792714db19e9c4317c44f11aa14 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Mon, 11 May 2020 16:58:59 -0400 Subject: [PATCH] move signalcallback to status module --- src/nim_status_client.nim | 11 +---------- src/status.nim | 13 +++++++++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index 04cba5c96d..e5e89fa4ff 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -6,15 +6,6 @@ import status import libstatus import json -var signalHandler: SignalCallback = proc(p0: cstring): void = - setupForeignThreadGc() - - var jsonSignal = ($p0).parseJson - if $jsonSignal["type"].getStr == "messages.new": - echo $p0 - - tearDownForeignThreadGc() - proc mainProc() = # From QT docs: # For any GUI application using Qt, there is precisely one QApplication object, @@ -30,7 +21,7 @@ proc mainProc() = var engine = newQQmlApplicationEngine() defer: engine.delete() - status.setSignalHandler(signalHandler) + status.setSignalHandler() status.setupNewAccount() discard status.addPeer("enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443") diff --git a/src/status.nim b/src/status.nim index 5e918910d7..dfe993cf5c 100644 --- a/src/status.nim +++ b/src/status.nim @@ -6,13 +6,22 @@ const datadir = "./data/" const keystoredir = "./data/keystore/" const nobackupdir = "./noBackup/" +var signalHandler: SignalCallback = proc(p0: cstring): void = + setupForeignThreadGc() + + var jsonSignal = ($p0).parseJson + if $jsonSignal["type"].getStr == "messages.new": + echo $p0 + + tearDownForeignThreadGc() + proc recreateDir(dirname: string) = if existsDir(dirname): removeDir(dirname) createDir(dirname) -proc setSignalHandler*(something: SignalCallback) = - libstatus.setSignalEventCallback(something) +proc setSignalHandler*() = + libstatus.setSignalEventCallback(signalHandler) proc queryAccounts*(): string = var payload = %* {