Srmm_AddIcon unbound from hLangpack

14 files changed, 28 insertions, 28 deletions

diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 292cd82fb8..4b09fb3b36 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -178,7 +178,7 @@ static int ExtraImgModulesLoaded(WPARAM, LPARAM)
 	StatusIconData sid = {};

 	sid.szModule = MODULENAME; // dwID = 0

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	HookEvent(ME_MSG_WINDOWEVENT, MsgWndEvent);

 	return 0;

diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp
index cdd8cbba7a..5b013ea536 100644
--- a/plugins/FavContacts/src/services.cpp
+++ b/plugins/FavContacts/src/services.cpp
@@ -151,7 +151,7 @@ int ProcessModulesLoaded(WPARAM, LPARAM)
 	sid.szTooltip = LPGEN("Favorite Contacts");

 	sid.hIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib);

 	sid.hIconDisabled = IcoLib_GetIconByHandle(iconList[1].hIcolib);

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	HookEvent(ME_MSG_ICONPRESSED, ProcessSrmmIconClick);

 	HookEvent(ME_MSG_WINDOWEVENT, ProcessSrmmEvent);

diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 723c12d8be..35227e54e3 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -932,7 +932,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
 		sid.szModule = MODULENAME;
 		sid.flags = MBF_HIDDEN;
 		sid.dwId = 1;
-		Srmm_AddIcon(&sid);
+		Srmm_AddIcon(&sid, g_plugin.m_hLang);
 	}
 
 	return 0;
diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index 9f10d6ed7d..7a40acb1a0 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -94,25 +94,25 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 		sid.szTooltip = LPGEN("Delete all events");

 

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 1;

 	sid.hIcon = LoadIconEx("act1");

 	sid.szTooltip = time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)];

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 2;

 	sid.hIcon = LoadIconEx("act2");

 	sid.szTooltip = keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)];

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 3;

 	sid.hIcon = LoadIconEx("actDel");

 	sid.szTooltip = LPGEN("Delete all events");

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	HookEvent(ME_MSG_WINDOWEVENT, OnWindowEvent);

 	HookEvent(ME_MSG_ICONPRESSED, OnIconPressed);

diff --git a/plugins/MessageState/src/messagestate.cpp b/plugins/MessageState/src/messagestate.cpp
index 189d31c317..34ee40af80 100644
--- a/plugins/MessageState/src/messagestate.cpp
+++ b/plugins/MessageState/src/messagestate.cpp
@@ -105,7 +105,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
 	sid.szModule = MODULENAME;

 	sid.flags = MBF_HIDDEN;

 	sid.dwId = 1;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	InitClistExtraIcon();

 	

diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp
index 66e34d6aaf..025d391f7d 100644
--- a/plugins/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/src/svcs_srmm.cpp
@@ -121,12 +121,12 @@ void InitSRMM()
 	sid.hIconDisabled = hIconNotSecure;
 	sid.flags = MBF_DISABLED | MBF_HIDDEN;
 	sid.szTooltip = LANG_OTR_TOOLTIP;
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	sid.dwId = 1;
 	sid.hIcon = hIconPrivate;
 	sid.hIconDisabled = hIconUnverified;
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 		
 	// hook the window events so that we can can change the status of the icon
 	HookEvent(ME_MSG_ICONPRESSED, SVC_IconPressed);
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 759ba64f78..3cbd78d649 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -115,12 +115,12 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 	sid.dwId = 0x00000001;
 	sid.hIcon = IcoLib_GetIcon("secured");
 	sid.szTooltip = LPGEN("GPG Turn off encryption");
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	sid.dwId = 0x00000002;
 	sid.hIcon = IcoLib_GetIcon("unsecured");
 	sid.szTooltip = LPGEN("GPG Turn on encryption");
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	if(globals.bJabberAPI)
 		GetJabberInterface(0,0);
diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 014d9cbf56..bdaf770712 100644
--- a/plugins/NoHistory/src/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
@@ -228,12 +228,12 @@ void SrmmMenu_Load()
 	sid.dwId = 0;

 	sid.szTooltip = LPGEN("History Enabled");

 	sid.hIcon = sid.hIconDisabled = hIconKeep;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 1;

 	sid.szTooltip = LPGEN("History Disabled");

 	sid.hIcon = sid.hIconDisabled = hIconRemove;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 		

 	// hook the window events so that we can can change the status of the icon

 	HookEvent(ME_MSG_WINDOWEVENT, WindowEvent);

diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index abee0ec5bd..aef8080306 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -110,22 +110,22 @@ void SrmmMenu_Load()
 	sid.dwId = 0;

 	sid.szTooltip = LPGEN("Popup Mode: Auto");

 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_POPUP);

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 1;

 	sid.szTooltip = LPGEN("Popup Mode: Favorite");

 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_OPT_FAVORITE);

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 2;

 	sid.szTooltip = LPGEN("Popup Mode: Ignore fullscreen");

 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_OPT_FULLSCREEN);

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	sid.dwId = 3;

 	sid.szTooltip = LPGEN("Popup Mode: Block contact");

 	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_NOPOPUP);

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);

 	HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 6537265502..019b4debbc 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -403,7 +403,7 @@ static void RegisterStatusIcons()
 	sid.hIcon = GetCachedIcon("scriver_TYPING");

 	sid.hIconDisabled = GetCachedIcon("scriver_TYPINGOFF");

 	sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 }

 

 void ChangeStatusIcons()

diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp
index aa131ad533..4fe6189727 100644
--- a/plugins/SecureIM/src/svcs_srmm.cpp
+++ b/plugins/SecureIM/src/svcs_srmm.cpp
@@ -40,28 +40,28 @@ void InitSRMMIcons()
 	sid.hIcon = mode2icon(MODE_NATIVE | SECURED, 3);

 	sid.hIconDisabled = mode2icon(MODE_NATIVE, 3);

 	sid.szTooltip = LPGEN("SecureIM [Native]");

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	// PGP

 	sid.dwId = MODE_PGP;

 	sid.hIcon = mode2icon(MODE_PGP | SECURED, 3);

 	sid.hIconDisabled = mode2icon(MODE_PGP, 3);

 	sid.szTooltip = LPGEN("SecureIM [PGP]");

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	// GPG

 	sid.dwId = MODE_GPG;

 	sid.hIcon = mode2icon(MODE_GPG | SECURED, 3);

 	sid.hIconDisabled = mode2icon(MODE_GPG, 3);

 	sid.szTooltip = LPGEN("SecureIM [GPG]");

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	// RSAAES

 	sid.dwId = MODE_RSAAES;

 	sid.hIcon = mode2icon(MODE_RSAAES | SECURED, 3);

 	sid.hIconDisabled = mode2icon(MODE_RSAAES, 3);

 	sid.szTooltip = LPGEN("SecureIM [RSA/AES]");

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	// hook the window events so that we can can change the status of the icon

 	HookEvent(ME_MSG_WINDOWEVENT, onWindowEvent);

diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp
index 1245f91681..de9b3582bd 100644
--- a/plugins/SpellChecker/src/spellchecker.cpp
+++ b/plugins/SpellChecker/src/spellchecker.cpp
@@ -204,7 +204,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 		mir_snwprintf(tmp, L"%s - %s", TranslateT("Spell Checker"), languages[i]->full_name);
 		sid.tszTooltip = tmp;
 		sid.hIcon = (opts.use_flags) ? IcoLib_GetIconByHandle(languages[i]->hIcolib) : IcoLib_GetIcon("spellchecker_enabled");
-		Srmm_AddIcon(&sid);
+		Srmm_AddIcon(&sid, g_plugin.m_hLang);
 	}
 
 	HOTKEYDESC hkd = {};
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index f5b0c07645..e2554acf5f 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1525,13 +1525,13 @@ int SI_InitStatusIcons()
 	StatusIconData sid = {};
 	sid.szModule = MSG_ICON_MODULE;
 	sid.dwId = MSG_ICON_SOUND; // Sounds
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	sid.dwId = MSG_ICON_UTN;
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	sid.dwId = MSG_ICON_SESSION;
-	Srmm_AddIcon(&sid);
+	Srmm_AddIcon(&sid, g_plugin.m_hLang);
 
 	HookEvent(ME_MSG_ICONSCHANGED, OnSrmmIconChanged);
 
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index dcbf1af0c5..972e4d5214 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -238,7 +238,7 @@ void SvcFlagsOnModulesLoaded()
 	sid.szModule = MODNAMEFLAGS;

 	if (!g_bShowStatusIconFlag)

 		sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid);

+	Srmm_AddIcon(&sid, g_plugin.m_hLang);

 

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);

 	HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, OnCListApplyIcons);