diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
| commit | d0ceb5768ff3146499a0318ffe03c867c0845592 (patch) | |
| tree | 984da5102d6a820e670323c47edd8187a37a0b33 /protocols/JabberG/src/jabber_iqid.cpp | |
| parent | 98ac258dc34b281e8441de847e37408c36c7415d (diff) | |
- numerous name conflicts resolved;
- funny code that loads resource #102 from miranda32.exe removed;
- massive mir_sntprintf code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_iqid.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 9326a4264b..5c55583396 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -502,7 +502,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) if (m_options.AutoJoinConferences)
for (int i=0; i < chatRooms.getCount(); i++)
- GroupchatJoinByHContact((MCONTACT)chatRooms[i], true);
+ GroupchatJoinByHContact((DWORD_PTR)chatRooms[i], true);
UI_SAFE_NOTIFY_HWND(m_hwndJabberAddBookmark, WM_JABBER_CHECK_ONLINE);
WindowList_Broadcast(m_hWindowList, WM_JABBER_CHECK_ONLINE, 0, 0);
@@ -648,7 +648,6 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) HXML vCardNode, m, n, o;
const TCHAR *type, *jid;
MCONTACT hContact;
- TCHAR text[128];
DBVARIANT dbv;
debugLogA("<iq/> iqIdGetVcard");
@@ -810,6 +809,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) else if (!mir_tstrcmp(XmlGetName(n), _T("ADR"))) {
if (!hasHome && XmlGetChild(n, "HOME") != NULL) {
// Home address
+ TCHAR text[128];
hasHome = true;
if ((m=XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) {
hasHomeStreet = true;
@@ -855,6 +855,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) // Work address
hasWork = true;
if ((m=XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) {
+ TCHAR text[128];
hasWorkStreet = true;
if (hContact != NULL) {
if ((o=XmlGetChild(n, "EXTADR")) != NULL && XmlGetText(o) != NULL)
|