From 74e9b42783af6a0a9d51df6271bca169e3dcc81d Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 12 Aug 2014 18:42:49 +0000 Subject: extraicons registration moved to Load() git-svn-id: http://svn.miranda-ng.org/main/trunk@10168 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/src/init.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/New_GPG') diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 633411c44a..b84b2c5c15 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -65,6 +65,8 @@ INT_PTR ToggleEncryption(WPARAM w, LPARAM l); INT_PTR SendKey(WPARAM w, LPARAM l); INT_PTR ExportGpGKeys(WPARAM w, LPARAM l); INT_PTR ImportGpGKeys(WPARAM w, LPARAM l); +int onExtraImageListRebuilding(WPARAM, LPARAM); +int onExtraImageApplying(WPARAM wParam, LPARAM); void init_vars() { @@ -112,8 +114,6 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) int GetJabberInterface(WPARAM w, LPARAM l); int onWindowEvent(WPARAM wParam, LPARAM lParam); int onIconPressed(WPARAM wParam, LPARAM lParam); - int onExtraImageListRebuilding(WPARAM, LPARAM); - int onExtraImageApplying(WPARAM wParam, LPARAM); int onProtoAck(WPARAM, LPARAM); INT_PTR onSendFile(WPARAM, LPARAM); void InitIconLib(); @@ -155,8 +155,6 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) HookEvent(ME_MSG_WINDOWEVENT, onWindowEvent); HookEvent(ME_MSG_ICONPRESSED, onIconPressed); - g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("GPG encryption status"), "secured", (MIRANDAHOOK)onExtraImageListRebuilding, (MIRANDAHOOK)onExtraImageApplying); - PROTOCOLDESCRIPTOR pd = { sizeof(pd) }; pd.szName = szGPGModuleName; pd.type = PROTOTYPE_ENCRYPTION; @@ -226,6 +224,8 @@ extern "C" int __declspec(dllexport) Load() mi.pszService="/ImportGPGKeys"; hImportGpgKeys = Menu_AddMainMenuItem(&mi); + g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying); + return 0; } -- cgit v1.2.3