From 9b99466b95de4d2666911fd622ff2a5005367516 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 14 Oct 2017 13:08:08 +0300
Subject: StatusManager to use the common hLangpack variable instead of dealing
 with separate variables which refer to the same value anyway

---
 plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp    |  1 -
 .../StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp   | 11 ++---------
 plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h |  2 --
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'plugins/StatusManager/src/AdvancedAutoAway')

diff --git a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
index 4b38ce59f8..c069b46db8 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
@@ -518,7 +518,6 @@ int AutoAwayOptInitialise(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.position = 1000000000;
 	odp.hInstance = hInst;
-	odp.hLangpack = hAAALangpack;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS);
 	odp.szTitle.a = LPGEN("Auto away");
 	odp.szGroup.a = LPGEN("Status");
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
index 81361b5c73..97ddeaef97 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.cpp
@@ -22,8 +22,6 @@
 
 #include "..\stdafx.h"
 
-int hAAALangpack = 0;
-
 #ifdef _DEBUG
 #define SECS_PER_MINUTE		20 /* speedup */
 #else
@@ -51,8 +49,7 @@ TAAAProtoSetting::~TAAAProtoSetting()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-HANDLE hAAAModuleLoadedHook = NULL,
-hStateChangedEvent = NULL;
+HANDLE hStateChangedEvent = NULL;
 
 static BOOL ignoreLockKeys = FALSE;
 static BOOL ignoreSysKeys = FALSE;
@@ -583,15 +580,11 @@ int AAAModuleLoaded(WPARAM, LPARAM)
 
 void AdvancedAutoAwayLoad()
 {
-	MUUID muidLast = MIID_LAST;
-	hAAALangpack = GetPluginLangId(muidLast, 0);
-
-	hAAAModuleLoadedHook = HookEvent(ME_SYSTEM_MODULESLOADED, AAAModuleLoaded);
+	HookEvent(ME_SYSTEM_MODULESLOADED, AAAModuleLoaded);
 	hStateChangedEvent = CreateHookableEvent(ME_AAA_STATECHANGED);
 }
 
 void AdvancedAutoAwayUnload()
 {
-	UnhookEvent(hAAAModuleLoadedHook);
 	DestroyHookableEvent(hStateChangedEvent);
 }
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
index e6d7969743..c529bf69e0 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
@@ -19,8 +19,6 @@
 #ifndef __ADVANCED_AUTOAWAY_HEADER
 #define __ADVANCED_AUTOAWAY_HEADER
 
-extern int hAAALangpack;
-
 #define AAAMODULENAME        "AdvancedAutoAway"
 #define SETTING_IGNLOCK      "IgnoreLockKeys"
 #define SETTING_IGNSYSKEYS   "IgnoreSysKeys"
-- 
cgit v1.2.3