From 488214ac8af0c4aeb1a5c1d8fd48368daaf4c4c7 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 12 Nov 2018 20:12:53 +0300
Subject: end of ME_OPT_INITIALISE related zoo in another plugins

---
 plugins/NotesAndReminders/src/main.cpp    | 19 +++----------------
 plugins/NotesAndReminders/src/options.cpp |  7 ++-----
 2 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'plugins/NotesAndReminders/src')

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 9255fcd318..317127c8b7 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -3,11 +3,6 @@
 CMPlugin g_plugin;
 HINSTANCE hmiranda = nullptr;
 
-HANDLE hkOptInit = nullptr;
-HANDLE hkTopToolbarInit = nullptr; 
-HANDLE hkModulesLoaded = nullptr;
-HANDLE hkFontChange = nullptr;
-HANDLE hkColorChange = nullptr;
 HMODULE hRichedDll = nullptr;
 
 extern TREEELEMENT *g_Stickies;
@@ -144,8 +139,6 @@ int OnTopToolBarInit(WPARAM, LPARAM)
 	ttb.pszService = MODULENAME"/MenuCommandNewReminder";
 	ttb.name = ttb.pszTooltipUp = LPGEN("Add New Reminder");
 	g_plugin.addTTB(&ttb);
-
-	UnhookEvent(hkTopToolbarInit);
 	return 0;
 }
 
@@ -251,9 +244,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
 	addMenuItem(mi);
 
 	// register misc
-	hkOptInit = HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
-	hkTopToolbarInit = HookEvent("TopToolBar/ModuleLoaded", OnTopToolBarInit);
-	UnhookEvent(hkModulesLoaded);
+	HookEvent("TopToolBar/ModuleLoaded", OnTopToolBarInit);
 
 	// init vars and load all data
 	InitSettings();
@@ -284,7 +275,8 @@ int CMPlugin::Load()
 	InitServices();
 	WS_Init();
 
-	hkModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
+	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
+	HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
 	InitIcons();
 
 	return 0;
@@ -302,11 +294,6 @@ int CMPlugin::Unload()
 	WS_CleanUp();
 	TermSettings();
 
-	UnhookEvent(hkFontChange);
-	UnhookEvent(hkColorChange);
-
-	UnhookEvent(hkOptInit);
-
 	IcoLib_ReleaseIcon(g_hReminderIcon);
 	DeleteObject(hBodyFont);
 	DeleteObject(hCaptionFont);
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 6b03a5493e..6e87a570be 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -3,9 +3,6 @@
 // min allowed alpha (don't want 0 because it's a waste of resources as well as might confuse user)
 #define MIN_ALPHA 30
 
-extern HANDLE hkFontChange;
-extern HANDLE hkColorChange;
-
 BOOL g_CloseAfterAddReminder, g_UseDefaultPlaySound;
 HICON g_hReminderIcon = nullptr;
 
@@ -268,8 +265,8 @@ void RegisterFontServiceFonts()
 		g_plugin.addColor(&colorid);
 	}
 
-	hkFontChange = HookEvent(ME_FONT_RELOAD, FS_FontsChanged);
-	hkColorChange = HookEvent(ME_COLOUR_RELOAD, FS_ColorChanged);
+	HookEvent(ME_FONT_RELOAD, FS_FontsChanged);
+	HookEvent(ME_COLOUR_RELOAD, FS_ColorChanged);
 }
 
 void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour)
-- 
cgit v1.2.3