- three remaining clist services converted into functions (Clist_MenuProcessCommand, Clist_IsDocked, Clist_MenuProcessHotkey);

- old unused junk removed from CLIST_INTERFACE with its stubs;
- all unused clist services also removed with bunch of another crap like unused params

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

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 6d414a8f7e..fae16001e1 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -100,11 +100,11 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 		break;

 

 	case WM_LBUTTONDBLCLK:

-		BriefInfo((WPARAM)data->hContact, 0);

+		BriefInfo(data->hContact, 0);

 		break;

 

 	case WM_COMMAND:	 //Needed by the contact's context menu

-		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)data->hContact))

+		if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, data->hContact))

 			break;

 		return FALSE;

 

@@ -116,7 +116,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 

 	case WM_NOTIFY:

 		if (((LPNMHDR)lParam)->code == NM_AVATAR_CHANGED) {

-			BOOL newava = CallService(MS_AV_GETAVATARBITMAP, (WPARAM)data->hContact, 0) != 0;

+			BOOL newava = CallService(MS_AV_GETAVATARBITMAP, data->hContact, 0) != 0;

 			if (newava != data->haveAvatar) {

 				LONG_PTR style = GetWindowLongPtr(data->hAvt, GWL_STYLE);

 				data->haveAvatar = newava;

@@ -293,7 +293,7 @@ INT_PTR Mwin_MenuClicked(WPARAM wParam, LPARAM)
 

 int BuildContactMenu(WPARAM wparam, LPARAM)

 {

-	int flags = db_get_dw((MCONTACT)wparam, WEATHERPROTONAME, "mwin", 0) ? CMIF_CHECKED : 0;

+	int flags = db_get_dw(wparam, WEATHERPROTONAME, "mwin", 0) ? CMIF_CHECKED : 0;

 	Menu_ModifyItem(hMwinMenu, NULL, INVALID_HANDLE_VALUE, flags);

 	return 0;

 }

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index c94e12a7ea..62beb8a588 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "stdafx.h"

 

 // variables for weather_popup.c

-static HANDLE hPopupContact;

+static MCONTACT hPopupContact;

 

 //============  SHOW WEATHER POPUPS  ============

 

@@ -175,7 +175,7 @@ LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 	case IDM_M7:	// display contact menu

 		hMenu = Menu_BuildContactMenu(wParam);

 		GetCursorPos(&pt);

-		hPopupContact = (HANDLE)wParam;

+		hPopupContact = wParam;

 		TrackPopupMenu(hMenu, TPM_LEFTALIGN, pt.x, pt.y, 0, hWnd, NULL);

 		DestroyMenu(hMenu);

 		break;

@@ -184,7 +184,7 @@ LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 		CallService(MS_USERINFO_SHOWDIALOG, wParam, 0);

 

 	case WM_COMMAND:	 //Needed by the contact's context menu

-		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)hPopupContact))

+		if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, hPopupContact))

 			break;

 		return FALSE;