3 files changed, 10 insertions, 10 deletions
diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index 12e7137c67..4fbd2bbf6c 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -49,11 +49,11 @@ static int UrlEventAdded(WPARAM wParam, LPARAM lParam)
 	SkinPlaySound("RecvUrl");
 
 	TCHAR szTooltip[256];
-	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((HCONTACT)wParam, 0));
+	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0));
 
 	CLISTEVENT cle = { sizeof(cle) };
 	cle.flags = CLEF_TCHAR;
-	cle.hContact = (HCONTACT)wParam;
+	cle.hContact = (MCONTACT)wParam;
 	cle.hDbEvent = (HANDLE)lParam;
 	cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL);
 	cle.pszService = "SRUrl/ReadUrl";
@@ -75,7 +75,7 @@ static void RestoreUnreadUrlAlerts(void)
 	cle.pszService = "SRUrl/ReadUrl";
 	cle.flags = CLEF_TCHAR;
 
-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		HANDLE hDbEvent = db_event_firstUnread(hContact);
 		while (hDbEvent) {
 			DBEVENTINFO dbei = { sizeof(dbei) };
@@ -97,7 +97,7 @@ static void RestoreUnreadUrlAlerts(void)
 static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
-	char *szProto = GetContactProto((HCONTACT)wParam);
+	char *szProto = GetContactProto((MCONTACT)wParam);
 	if (lstrcmpA(cws->szModule, "CList") && (szProto == NULL || lstrcmpA(cws->szModule, szProto)))
 		return 0;
 
@@ -108,7 +108,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM)
 {
 	bool bEnabled = false;
-	char *szProto = GetContactProto((HCONTACT)wParam);
+	char *szProto = GetContactProto((MCONTACT)wParam);
 	if (szProto != NULL)
 		if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND)
 			bEnabled = true;
@@ -147,7 +147,7 @@ static int SRUrlShutdown(WPARAM, LPARAM)
 
 int UrlContactDeleted(WPARAM wParam, LPARAM)
 {
-	HWND h = WindowList_Find(hUrlWindowList, (HCONTACT)wParam);
+	HWND h = WindowList_Find(hUrlWindowList, (MCONTACT)wParam);
 	if (h)
 		SendMessage(h, WM_CLOSE, 0, 0);
 
diff --git a/src/core/stdurl/url.h b/src/core/stdurl/url.h
index 075f14ecbb..dd8b2eda0f 100644
--- a/src/core/stdurl/url.h
+++ b/src/core/stdurl/url.h
@@ -29,12 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DDEMESSAGETIMEOUT   1000
 
 struct UrlRcvData {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	HANDLE hDbEvent;
 };
 
 struct UrlSendData {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	HANDLE hSendId;
 	HANDLE hAckEvent;
 	char *sendBuffer;
diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index 9a654fa9ff..c541825d9f 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -28,7 +28,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 
 extern HANDLE hUrlWindowList;
 
-static void sttUpdateTitle(HWND hwndDlg, HCONTACT hContact)
+static void sttUpdateTitle(HWND hwndDlg, MCONTACT hContact)
 {
 	TCHAR newtitle[256], oldtitle[256];
 	TCHAR *szStatus, *contactName, *pszNewTitleStart = TranslateT("Send URL to");
@@ -467,7 +467,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_LIMITTEXT, 450, 0);
 		dat = (struct UrlSendData*)mir_alloc(sizeof(struct UrlSendData));
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);
-		dat->hContact = (HCONTACT)lParam;
+		dat->hContact = (MCONTACT)lParam;
 		dat->hAckEvent = NULL;
 		dat->hSendId = NULL;
 		dat->sendBuffer = NULL;