summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-28 16:22:26 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-28 16:22:26 +0000
commite2a7ef178bbd1e0d3998cc327c7a12c12746ccda (patch)
tree722171063c0eaed4909fabac7e5866e1e6ce1fd9 /protocols
parentb1873e87a089607c1f9b856cabe245945d62033d (diff)
we don't check whether the new Jabber account belongs to Google or not, cause it has no settings
git-svn-id: http://svn.miranda-ng.org/main/trunk@4227 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/GTalkExt/src/handlers.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp
index b41905ff03..e1dd02b925 100644
--- a/protocols/GTalkExt/src/handlers.cpp
+++ b/protocols/GTalkExt/src/handlers.cpp
@@ -323,13 +323,13 @@ extern DWORD itlsRecursion;
BOOL SendHandler(IJabberInterface *ji, HXML node, void *pUserData)
{
- if (TlsGetValue(itlsRecursion))
- return FALSE;
HXML queryNode = xi.getChildByAttrValue(node, NODENAME_QUERY, ATTRNAME_XMLNS, DISCOVERY_XMLNS);
if (!queryNode)
return FALSE;
if ( lstrcmp(xi.getName(node), NODENAME_IQ) || lstrcmp(xi.getAttrValue(node, ATTRNAME_TYPE), IQTYPE_GET))
return FALSE;
+ if (TlsGetValue(itlsRecursion))
+ return FALSE;
TlsSetValue(itlsRecursion, (PVOID)TRUE);
@@ -371,7 +371,7 @@ IJabberInterface* IsGoogleAccount(LPCSTR szModuleName)
int AccListChanged(WPARAM wParam, LPARAM lParam)
{
if (wParam == PRAC_ADDED) {
- IJabberInterface *ji = IsGoogleAccount(((PROTOACCOUNT*)lParam)->szModuleName);
+ IJabberInterface *ji = getJabberApi(((PROTOACCOUNT*)lParam)->szModuleName);
if (ji)
ji->Net()->AddSendHandler(SendHandler);
}