diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 20:47:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 20:47:51 +0000 |
| commit | 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 (patch) | |
| tree | fcc340ad7067561e57733b287f193a7dbed93dd4 /protocols/JabberG/src/jabber_util.cpp | |
| parent | 7193759b046338c6f47ff2edb34743a1465791cd (diff) | |
HCONTACT is not needed anymore
git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_util.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_util.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index 9a881deafb..a93186ee14 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -32,14 +32,14 @@ int CJabberProto::SerialNext(void) }
///////////////////////////////////////////////////////////////////////////////
-// JabberChatRoomHContactFromJID - looks for the char room HCONTACT with required JID
+// JabberChatRoomHContactFromJID - looks for the char room MCONTACT with required JID
-HCONTACT CJabberProto::ChatRoomHContactFromJID(const TCHAR *jid)
+MCONTACT CJabberProto::ChatRoomHContactFromJID(const TCHAR *jid)
{
if (jid == NULL)
return NULL;
- for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
+ for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
ptrT dbJid( getTStringA(hContact, "ChatRoomID"));
if (dbJid == NULL)
if ((dbJid = getTStringA(hContact, "jid")) == NULL)
@@ -53,16 +53,16 @@ HCONTACT CJabberProto::ChatRoomHContactFromJID(const TCHAR *jid) }
///////////////////////////////////////////////////////////////////////////////
-// JabberHContactFromJID - looks for the HCONTACT with required JID
+// JabberHContactFromJID - looks for the MCONTACT with required JID
-HCONTACT CJabberProto::HContactFromJID(const TCHAR *jid, BOOL bStripResource)
+MCONTACT CJabberProto::HContactFromJID(const TCHAR *jid, BOOL bStripResource)
{
if (jid == NULL)
return NULL;
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_CHATROOM, jid);
- for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
+ for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
bool bIsChat = isChatRoom(hContact);
ptrT dbJid( getTStringA(hContact, bIsChat ? "ChatRoomID" : "jid"));
@@ -513,7 +513,7 @@ void CJabberProto::SendVisibleInvisiblePresence(BOOL invisible) if (item == NULL)
continue;
- HCONTACT hContact = HContactFromJID(item->jid);
+ MCONTACT hContact = HContactFromJID(item->jid);
if (hContact == NULL)
continue;
@@ -727,7 +727,7 @@ int __stdcall JabberGetPacketID(HXML n) ///////////////////////////////////////////////////////////////////////////////
// JabberGetClientJID - adds a resource postfix to a JID
-TCHAR* CJabberProto::GetClientJID(HCONTACT hContact, TCHAR *dest, size_t destLen)
+TCHAR* CJabberProto::GetClientJID(MCONTACT hContact, TCHAR *dest, size_t destLen)
{
if (hContact == NULL)
return NULL;
@@ -932,7 +932,7 @@ static VOID CALLBACK sttRebuildInfoFrameApcProc(void* param) {
if ((item=ppro->ListGetItemPtrFromIndex(i)) != NULL) {
if (_tcschr(item->jid, '@') == NULL && _tcschr(item->jid, '/') == NULL && item->subscription!=SUB_NONE) {
- HCONTACT hContact = ppro->HContactFromJID(item->jid);
+ MCONTACT hContact = ppro->HContactFromJID(item->jid);
if (hContact == NULL) continue;
char name[128];
|