From bd820972afe24409e6b570adbc45f5dc0fa2385d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 11 Apr 2013 07:08:40 +0000
Subject: SRMM icons to be unloaded automatically

git-svn-id: http://svn.miranda-ng.org/main/trunk@4418 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/New_GPG/src/init.cpp | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'plugins/New_GPG')

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 46a0aaa475..01bf91848c 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -124,26 +124,21 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	if(!db_get_b(NULL, szGPGModuleName, "FirstRun", 1))
 		InitCheck();
 	InitIconLib();
-	if(ServiceExists(MS_MSG_ADDICON)) 
-	{
-		HICON IconLibGetIcon(const char* ident);
-		StatusIconData sid = {0};
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.flags = MBF_HIDDEN;
-		sid.dwId = 0x00000001;
-		sid.hIcon = IconLibGetIcon("secured");
-		sid.szTooltip = Translate("GPG Turn off encryption");
-		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
-		ZeroMemory(&sid, sizeof(sid));
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.flags = MBF_HIDDEN;
-		sid.dwId = 0x00000002;
-		sid.hIcon = IconLibGetIcon("unsecured");
-		sid.szTooltip = Translate("GPG Turn on encryption");
-		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
-	}
+
+	HICON IconLibGetIcon(const char* ident);
+
+	StatusIconData sid = { sizeof(sid) };
+	sid.szModule = szGPGModuleName;
+	sid.flags = MBF_HIDDEN;
+	sid.dwId = 0x00000001;
+	sid.hIcon = IconLibGetIcon("secured");
+	sid.szTooltip = Translate("GPG Turn off encryption");
+	Srmm_AddIcon(&sid);
+
+	sid.dwId = 0x00000002;
+	sid.hIcon = IconLibGetIcon("unsecured");
+	sid.szTooltip = Translate("GPG Turn on encryption");
+	Srmm_AddIcon(&sid);
 
 	bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT) != 0;
 	
-- 
cgit v1.2.3