icons registration moved to Load()

git-svn-id: http://svn.miranda-ng.org/main/trunk@10180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 2 deletions

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index b84b2c5c15..4e8c83192c 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -67,6 +67,7 @@ INT_PTR ExportGpGKeys(WPARAM w, LPARAM l);
 INT_PTR ImportGpGKeys(WPARAM w, LPARAM l);

 int onExtraImageListRebuilding(WPARAM, LPARAM);

 int onExtraImageApplying(WPARAM wParam, LPARAM);

+void InitIconLib();

 

 void init_vars()

 {

@@ -116,14 +117,12 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	int onIconPressed(WPARAM wParam, LPARAM lParam);

 	int onProtoAck(WPARAM, LPARAM);

 	INT_PTR onSendFile(WPARAM, LPARAM);

-	void InitIconLib();

 

 	void InitCheck();

 	void FirstRun();

 	FirstRun();

 	if(!db_get_b(NULL, szGPGModuleName, "FirstRun", 1))

 		InitCheck();

-	InitIconLib();

 

 	HICON IconLibGetIcon(const char* ident);

 

@@ -224,6 +223,8 @@ extern "C" int __declspec(dllexport) Load()
 	mi.pszService="/ImportGPGKeys";

 	hImportGpgKeys = Menu_AddMainMenuItem(&mi);

 

+	InitIconLib();

+

 	g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying);

 

 	return 0;