diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-02 11:55:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-02 11:55:58 +0000 |
| commit | 4e49ff4ab147ac067794657149c05d96c8980041 (patch) | |
| tree | b88f610349244fff134f37b5adf4e4c4e62993a0 | |
| parent | 0a303d6d1bc5650b20ee382f7af80da6a05648be (diff) | |
fix for reading email in GTalkExt
git-svn-id: http://svn.miranda-ng.org/main/trunk@6307 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/GTalkExt/src/GTalkExt.cpp | 2 | ||||
| -rw-r--r-- | protocols/GTalkExt/src/handlers.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/protocols/GTalkExt/src/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp index b0ca3cf84b..120a89bb31 100644 --- a/protocols/GTalkExt/src/GTalkExt.cpp +++ b/protocols/GTalkExt/src/GTalkExt.cpp @@ -31,7 +31,7 @@ int hLangpack;
HICON g_hPopupIcon = 0;
-LIST<GoogleTalkAcc> g_accs(1, PtrKeySortT);
+LIST<GoogleTalkAcc> g_accs(1, HandleKeySortT);
PLUGININFOEX pluginInfo =
{
diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp index f7e34e1489..f8e237345e 100644 --- a/protocols/GTalkExt/src/handlers.cpp +++ b/protocols/GTalkExt/src/handlers.cpp @@ -306,12 +306,16 @@ BOOL SendHandler(IJabberInterface *ji, HXML node, void *pUserData) HXML newNode = xi.createNode(NODENAME_IQ, NULL, FALSE);
xi.addAttr(newNode, ATTRNAME_TYPE, IQTYPE_GET);
xi.addAttr(newNode, ATTRNAME_TO, xi.getAttrValue(node, ATTRNAME_TO));
- xi.addAttrInt(newNode, ATTRNAME_ID, id);
+
+ TCHAR idAttr[30];
+ mir_sntprintf(idAttr, SIZEOF(idAttr), JABBER_IQID_FORMAT, id);
+ xi.addAttr(newNode, ATTRNAME_ID, idAttr);
+
xi.addAttr(xi.addChild(newNode, NODENAME_QUERY, NULL), ATTRNAME_XMLNS, DISCOVERY_XMLNS);
ji->SendXmlNode(newNode);
xi.destroyNode(newNode);
- ji->AddTemporaryIqHandler(DiscoverHandler, JABBER_IQ_TYPE_RESULT, id, NULL, RESPONSE_TIMEOUT);
+ ji->AddTemporaryIqHandler(DiscoverHandler, JABBER_IQ_TYPE_RESULT, id, NULL, RESPONSE_TIMEOUT);
TlsSetValue(itlsRecursion, (PVOID)FALSE);
}
|