diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
| commit | 33953cc6a0fab6a91af293c6838f8a46dd7922da (patch) | |
| tree | 2dbbe718ad42545bde6c9f7672387827c530550a /protocols/JabberG | |
| parent | e190a7fde521bd6af9ea485cc730f854aaf38e11 (diff) | |
HCONTACT, part 3
git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_archive.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp index 0786b363bf..11c972ca3b 100644 --- a/protocols/JabberG/src/jabber_archive.cpp +++ b/protocols/JabberG/src/jabber_archive.cpp @@ -95,7 +95,7 @@ void CJabberProto::OnIqResultGetCollectionList(HXML iqNode, CJabberIqInfo*) /////////////////////////////////////////////////////////////////////////////////////////
static DWORD dwPreviousTimeStamp = -1;
-static HANDLE hPreviousContact = INVALID_HANDLE_VALUE;
+static HCONTACT hPreviousContact = (HCONTACT)INVALID_HANDLE_VALUE;
static HANDLE hPreviousDbEvent = NULL;
// Returns TRUE if the event already exist in the database
@@ -240,7 +240,7 @@ BOOL IsDuplicateEvent(HCONTACT hContact, DBEVENTINFO& dbei) }
}
// reset last event
- hPreviousContact = INVALID_HANDLE_VALUE;
+ hPreviousContact = (HCONTACT)INVALID_HANDLE_VALUE;
return FALSE;
}
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index d43a3b85ff..4e1ce74aa6 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1328,7 +1328,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g case IDM_PRESENCE_NA:
case IDM_PRESENCE_DND:
case IDM_PRESENCE_FREE4CHAT:
- if (HANDLE h = ppro->HContactFromJID(item->jid))
+ if (HCONTACT h = ppro->HContactFromJID(item->jid))
ppro->OnMenuHandleDirectPresence((WPARAM)h, 0, gch->dwData);
break;
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index c069d7fb31..04f05dd3e8 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -458,7 +458,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) CallServiceSync(MS_GC_NEWSESSION, 0, (LPARAM)&gcw);
db_unset(hContact, "CList", "Hidden");
- chatRooms.insert(hContact);
+ chatRooms.insert((HANDLE)hContact);
}
else UpdateSubscriptionInfo(hContact, item);
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index fad43be645..fc34abf429 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -1276,7 +1276,7 @@ HANDLE __cdecl CJabberProto::GetAwayMsg(HCONTACT hContact) {
debugLogA("GetAwayMsg called, hContact=%08X", hContact);
- ForkThread(&CJabberProto::GetAwayMsgThread, hContact);
+ ForkThread(&CJabberProto::GetAwayMsgThread, (void*)hContact);
return (HANDLE)1;
}
|