- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

1 files changed, 12 insertions, 12 deletions

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index bb85ac1f74..adb80356f6 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -74,10 +74,10 @@ struct UserInfoStringBuf
 

 struct JabberUserInfoDlgData

 {

-	CJabberProto*     ppro;

-	HANDLE            hContact;

+	HCONTACT hContact;

+	CJabberProto *ppro;

 	JABBER_LIST_ITEM *item;

-	int               resourcesCount;

+	int resourcesCount;

 };

 

 enum

@@ -311,7 +311,7 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 		sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Miranda core version"), r->m_tszXMirandaCoreVersion, sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++));

 }

 

-static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM htiRoot, DWORD dwInfoLine, HANDLE hContact, TCHAR *szTitle, char *pszSlot)

+static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM htiRoot, DWORD dwInfoLine, HCONTACT hContact, TCHAR *szTitle, char *pszSlot)

 {

 	char *szAdvStatusIcon = ppro->ReadAdvStatusA(hContact, pszSlot, ADVSTATUS_VAL_ICON);

 	TCHAR *szAdvStatusTitle = ppro->ReadAdvStatusT(hContact, pszSlot, ADVSTATUS_VAL_TITLE);

@@ -340,7 +340,7 @@ static void sttFillUserInfo(CJabberProto *ppro, HWND hwndTree, JABBER_LIST_ITEM
 	HTREEITEM htiRoot = sttFillInfoLine(hwndTree, NULL, ppro->LoadIconEx("main"), _T("JID"), item->jid, sttInfoLineId(0, INFOLINE_NAME), true);

 	TCHAR buf[256];

 

-	if (HANDLE hContact = ppro->HContactFromJID(item->jid)) {

+	if (HCONTACT hContact = ppro->HContactFromJID(item->jid)) {

 		sttFillAdvStatusInfo(ppro, hwndTree, htiRoot, sttInfoLineId(0, INFOLINE_MOOD), hContact, TranslateT("Mood"), ADVSTATUS_MOOD);

 		sttFillAdvStatusInfo(ppro, hwndTree, htiRoot, sttInfoLineId(0, INFOLINE_ACTIVITY), hContact, TranslateT("Activity"), ADVSTATUS_ACTIVITY);

 		sttFillAdvStatusInfo(ppro, hwndTree, htiRoot, sttInfoLineId(0, INFOLINE_TUNE), hContact, TranslateT("Tune"), ADVSTATUS_TUNE);

@@ -445,7 +445,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		dat->resourcesCount = -1;

 

 		if (CallService(MS_DB_CONTACT_IS, (WPARAM)lParam, 0))

-			dat->hContact = (HANDLE)lParam;

+			dat->hContact = (HCONTACT)lParam;

 		else if (!IsBadReadPtr((void*)lParam, sizeof(JABBER_LIST_ITEM))) {

 			dat->hContact = NULL;

 			dat->item = (JABBER_LIST_ITEM *)lParam;

@@ -550,7 +550,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_INFOCHANGED:

 				{

-					HANDLE hContact = (HANDLE)((LPPSHNOTIFY) lParam)->lParam;

+					HCONTACT hContact = (HCONTACT)((LPPSHNOTIFY)lParam)->lParam;

 					SendMessage(hwndDlg, WM_JABBER_REFRESH, 0, (LPARAM)hContact);

 				}

 				break;

@@ -589,8 +589,8 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 

 struct USER_PHOTO_INFO

 {

-	HANDLE        hContact;

-	HBITMAP       hBitmap;

+	HCONTACT hContact;

+	HBITMAP hBitmap;

 	CJabberProto *ppro;

 };

 

@@ -605,7 +605,7 @@ static INT_PTR CALLBACK JabberUserPhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wP
 		// lParam is hContact

 		TranslateDialogDefault(hwndDlg);

 		photoInfo = (USER_PHOTO_INFO *) mir_alloc(sizeof(USER_PHOTO_INFO));

-		photoInfo->hContact = (HANDLE)lParam;

+		photoInfo->hContact = (HCONTACT)lParam;

 		photoInfo->ppro = NULL;

 		photoInfo->hBitmap = NULL;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) photoInfo);

@@ -800,7 +800,7 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 	if (!CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)m_szModuleName))

 		return 0;

 

-	HANDLE hContact = (HANDLE)lParam;

+	HCONTACT hContact = (HCONTACT)lParam;

 	if (hContact == NULL) {

 		// Show our vcard

 		OnUserInfoInit_VCard(wParam, lParam);

@@ -844,7 +844,7 @@ void JabberUserInfoUninit()
 /////////////////////////////////////////////////////////////////////////////////////////

 // JabberUserInfoUpdate

 

-void JabberUserInfoUpdate(HANDLE hContact)

+void JabberUserInfoUpdate(HCONTACT hContact)

 {

 	if (!hContact)

 		WindowList_BroadcastAsync(hUserInfoList, WM_JABBER_REFRESH, 0, 0);