From 9f478bb53be99c6ad5cf69c1a61cc14900cf72b8 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Wed, 13 Aug 2014 18:05:18 +0000
Subject: icons registration moved to Load()

git-svn-id: http://svn.miranda-ng.org/main/trunk@10180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Ping/src/common.h  |  2 ++
 plugins/Ping/src/ping.cpp  | 12 ++++++++++++
 plugins/Ping/src/utils.cpp | 14 +-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'plugins/Ping')

diff --git a/plugins/Ping/src/common.h b/plugins/Ping/src/common.h
index 35792e7ea7..8e4398b4b9 100644
--- a/plugins/Ping/src/common.h
+++ b/plugins/Ping/src/common.h
@@ -134,4 +134,6 @@ extern CRITICAL_SECTION thread_finished_cs, list_changed_cs, data_list_cs;
 
 extern PINGLIST data_list;
 
+int ReloadIcons(WPARAM, LPARAM);
+
 #endif
diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp
index 64dd259a65..d63cbcbe9c 100644
--- a/plugins/Ping/src/ping.cpp
+++ b/plugins/Ping/src/ping.cpp
@@ -117,6 +117,14 @@ int OnModulesLoaded(WPARAM, LPARAM) {
 	return 0;
 }
 
+static IconItem iconList[] =
+{
+	{ LPGEN("Responding"), "ping_responding", IDI_ICON_RESPONDING },
+	{ LPGEN("Not Responding"), "ping_not_responding", IDI_ICON_NOTRESPONDING },
+	{ LPGEN("Testing"), "ping_testing", IDI_ICON_TESTING },
+	{ LPGEN("Disabled"), "ping_disabled", IDI_ICON_DISABLED },
+};
+
 extern "C" __declspec(dllexport) int Load(void)
 {
 	//if(init_raw_ping()) {
@@ -148,6 +156,10 @@ extern "C" __declspec(dllexport) int Load(void)
 
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnShutdown);
 
+	Icon_Register(hInst, LPGEN("Ping"), iconList, SIZEOF(iconList));
+
+	HookEvent(ME_SKIN2_ICONSCHANGED, ReloadIcons);
+
 	return 0;
 }
 
diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp
index 6d089eb633..814e4d6f81 100644
--- a/plugins/Ping/src/utils.cpp
+++ b/plugins/Ping/src/utils.cpp
@@ -307,7 +307,7 @@ static int OnShutdown(WPARAM, LPARAM)
 	return 0;
 }
 
-static int ReloadIcons(WPARAM, LPARAM)
+int ReloadIcons(WPARAM, LPARAM)
 {
 	hIconResponding = Skin_GetIcon("ping_responding");
 	hIconNotResponding = Skin_GetIcon("ping_not_responding");
@@ -318,25 +318,13 @@ static int ReloadIcons(WPARAM, LPARAM)
 	return 0;
 }
 
-static IconItem iconList[] = 
-{
-	{ LPGEN("Responding"), "ping_responding", IDI_ICON_RESPONDING },
-	{ LPGEN("Not Responding"), "ping_not_responding", IDI_ICON_NOTRESPONDING },
-	{ LPGEN("Testing"), "ping_testing", IDI_ICON_TESTING },
-	{ LPGEN("Disabled"), "ping_disabled", IDI_ICON_DISABLED },
-};
-
 void InitUtils()
 {
-	Icon_Register(hInst, LPGEN("Ping"), iconList, SIZEOF(iconList));
-
 	hIconResponding = Skin_GetIcon("ping_responding");
 	hIconNotResponding = Skin_GetIcon("ping_not_responding");
 	hIconTesting = Skin_GetIcon("ping_testing");
 	hIconDisabled = Skin_GetIcon("ping_disabled");
 
-	HookEvent(ME_SKIN2_ICONSCHANGED, ReloadIcons);
-
 	POPUPCLASS test = { sizeof(test) };
 	test.flags = PCF_TCHAR;
 	test.hIcon = hIconResponding;
-- 
cgit v1.2.3