From caff89011ee731657192dc076b6a1ea54fcee520 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 8 Dec 2017 07:42:32 +0300 Subject: new_gpg: a bit of refactoring - eliminated few confusing globals (including unnecessary mutex) - implemeted proper way to avoid collisions in some places --- plugins/New_GPG/src/options.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'plugins/New_GPG/src/options.cpp') diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 4d6b3a5bc6..8ff4c114c1 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -261,8 +261,8 @@ public: void onClick_SELECT_KEY(CCtrlButton*) { - void ShowFirstRunDialog(); - ShowFirstRunDialog(); + CDlgFirstRun *d = new CDlgFirstRun; + d->Show(); } void onClick_SAVE_KEY_BUTTON(CCtrlButton*) @@ -678,8 +678,8 @@ public: void onClick_SELECT_EXISTING(CCtrlButton*) { - void ShowSelectExistingKeyDialog(); - ShowSelectExistingKeyDialog(); + CDlgLoadExistingKey *d = new CDlgLoadExistingKey; + d->Show(); } void onClick_OK(CCtrlButton*) @@ -1048,10 +1048,8 @@ public: } void onClick_IMPORT(CCtrlButton*) { - globals.new_key_hcnt_mutex.lock(); - globals.new_key_hcnt = hContact; - void ShowImportKeyDialog(); - ShowImportKeyDialog(); + CDlgImportKey *d = new CDlgImportKey(hContact); + d->Show(); } }; -- cgit v1.2.3