From 33953cc6a0fab6a91af293c6838f8a46dd7922da Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 14:42:51 +0000
Subject: HCONTACT, part 3

git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/avatars.cpp     | 2 +-
 plugins/Popup/src/avatars_gif.cpp | 2 +-
 plugins/Popup/src/popup_wnd2.cpp  | 4 ++--
 plugins/Popup/src/popup_wnd2.h    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/avatars.cpp b/plugins/Popup/src/avatars.cpp
index 79dd9d2b38..e40c13eb04 100644
--- a/plugins/Popup/src/avatars.cpp
+++ b/plugins/Popup/src/avatars.cpp
@@ -47,5 +47,5 @@ PopupAvatar *PopupAvatar::create(HCONTACT hContact)
 		}
 	}
 
-	return new SimpleAvatar(hContact);
+	return new SimpleAvatar((HANDLE)hContact);
 }
diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp
index 5526f9cef3..2297a3b5a9 100644
--- a/plugins/Popup/src/avatars_gif.cpp
+++ b/plugins/Popup/src/avatars_gif.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "headers.h"
 
-GifAvatar::GifAvatar(HCONTACT hContact): PopupAvatar(hContact)
+GifAvatar::GifAvatar(HCONTACT hContact): PopupAvatar((HANDLE)hContact)
 {
 	av = (avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0);
 	bIsAnimated = true;
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index 5f0f2e65f3..0a04b15a54 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -1078,7 +1078,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 		break;
 
 	case UM_AVATARCHANGED:
-		if ((HANDLE)wParam == m_hContact)
+		if ((HCONTACT)wParam == m_hContact)
 		{
 			m_avatar->invalidate();
 			update();
@@ -1142,7 +1142,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 		case ACT_DEF_ADD:
 			{
 				ADDCONTACTSTRUCT acs = {0};
-				acs.handle = m_hContact;
+				acs.hContact = m_hContact;
 				acs.handleType = HANDLE_CONTACT;
 				acs.szProto = 0;
 				CallServiceSync(MS_ADDCONTACT_SHOW, NULL, (LPARAM)&acs);
diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h
index 4c851275d9..268bf9d372 100644
--- a/plugins/Popup/src/popup_wnd2.h
+++ b/plugins/Popup/src/popup_wnd2.h
@@ -162,8 +162,8 @@ public:
 
 	char    *getTime()          { return m_time; }
 	HICON    getIcon()          { return m_hIcon; }
-	HANDLE   getContact()       { return m_hContact; }
-	HANDLE   getContactPassed() { return m_hContactPassed; }
+	HCONTACT getContact()       { return m_hContact; }
+	HCONTACT getContactPassed() { return m_hContactPassed; }
 	int      getTimeout()       { return m_iTimeout; }
 	HWND     getHwnd()          { return m_hwnd; }
 	void    *getData()          { return m_PluginData; }
-- 
cgit v1.2.3