From ef0abe4f9f67eeff4007f4839ba08a503472c74c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 21 Jan 2014 23:24:02 +0000
Subject: - new typed helper, WindowList_Create, to create a window list - new
 service, WindowList_Destroy, to destroy a window list - internal
 windowlist.cpp implementation rewritten to LIST<>

git-svn-id: http://svn.miranda-ng.org/main/trunk@7823 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/main.cpp      | 1 +
 plugins/Popup/src/srmm_menu.cpp | 7 ++++++-
 plugins/Popup/src/srmm_menu.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 50972b1b36..8523cdf518 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -446,6 +446,7 @@ MIRAPI int Unload(void)
 	UnloadPopupThread();
 	UnloadPopupWnd2();
 	PopupHistoryUnload();
+	SrmmMenu_Unload();
 
 	UnregisterClass (MAKEINTATOM(g_wndClass.cPopupWnd2),hInst);
 	UnregisterClassW(L"PopupEditBox",hInst);
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index cf4d75738c..ae757444a3 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -54,7 +54,7 @@ static int SrmmMenu_ProcessEvent(WPARAM, LPARAM lParam)
 
 	if (mwevent->uType == MSG_WINDOW_EVT_OPEN) {
 		if (!hDialogsList)
-			hDialogsList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+			hDialogsList = WindowList_Create();
 
 		WindowList_Add(hDialogsList, mwevent->hwndWindow, mwevent->hContact);
 		SrmmMenu_UpdateIcon(mwevent->hContact);
@@ -131,3 +131,8 @@ void SrmmMenu_Load()
 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);
 	HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);
 }
+
+void SrmmMenu_Unload()
+{
+	WindowList_Destroy(hDialogsList);
+}
diff --git a/plugins/Popup/src/srmm_menu.h b/plugins/Popup/src/srmm_menu.h
index 67ea73cc12..c64d3b303c 100644
--- a/plugins/Popup/src/srmm_menu.h
+++ b/plugins/Popup/src/srmm_menu.h
@@ -25,5 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __srmm_menu_h__
 
 void SrmmMenu_Load();
+void SrmmMenu_Unload();
 
 #endif // __srmm_menu_h__
-- 
cgit v1.2.3