MS_CLUI_GETHWND & MS_CLUI_GETHWNDTREE replaced with pcli->hwndContactList & pcli->hwndContactTree respectively

git-svn-id: http://svn.miranda-ng.org/main/trunk@14386 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 5 insertions, 4 deletions

diff --git a/plugins/Nudge/src/headers.h b/plugins/Nudge/src/headers.h
index 5a1fa0e324..34c5abaf07 100644
--- a/plugins/Nudge/src/headers.h
+++ b/plugins/Nudge/src/headers.h
@@ -14,6 +14,7 @@
 #include <m_langpack.h>	

 #include <m_popup.h>	

 #include <m_clui.h>

+#include <m_clistint.h>

 #include <m_message.h>

 #include <m_ignore.h>

 #include <m_options.h>

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index ac5e64c5f0..5ff5cf9a86 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -10,6 +10,7 @@ CNudgeElement DefaultNudge;
 CShake shake;

 CNudge GlobalNudge;

 

+CLIST_INTERFACE *pcli;

 int hLangpack = 0;

 

 //========================

@@ -82,7 +83,7 @@ INT_PTR NudgeSend(WPARAM hContact, LPARAM lParam)
 

 void OpenContactList()

 {

-	HWND hWnd = (HWND) CallService(MS_CLUI_GETHWND,0,0);

+	HWND hWnd = pcli->hwndContactList;

 	ShowWindow(hWnd, SW_RESTORE);

 	ShowWindow(hWnd, SW_SHOW);

 }

@@ -320,6 +321,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam)
 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

+	mir_getCLI();

 

 	LoadIcons();

 

diff --git a/plugins/Nudge/src/shake.cpp b/plugins/Nudge/src/shake.cpp
index 8ebd3a97f1..cf3e7c24f2 100644
--- a/plugins/Nudge/src/shake.cpp
+++ b/plugins/Nudge/src/shake.cpp
@@ -31,9 +31,7 @@ void __cdecl ShakeClistWindow(void *Param)
 

 INT_PTR ShakeClist(WPARAM wParam, LPARAM lParam)

 {

-	HWND hWnd = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);

-

-	mir_forkthread(ShakeClistWindow, (void*)hWnd);

+	mir_forkthread(ShakeClistWindow, (void*)pcli->hwndContactList);

 	return 0;

 }