summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-07-10 13:54:28 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-07-10 13:54:28 +0000
commit3bcc4ebb3e1a43574fb934a80903feaa56642089 (patch)
tree254424be4b3f19e17a089bee94c66ce2acac0106 /protocols/JabberG/src/jabber_proto.cpp
parentd5d50b471277d5d69f59a8f29bf87201149ce191 (diff)
obsolete helper removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@5306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rw-r--r--protocols/JabberG/src/jabber_proto.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 3a67f25fe6..6e2e1d0d84 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -878,13 +878,11 @@ HANDLE __cdecl CJabberProto::SearchByEmail(const TCHAR *email)
if ( !m_bJabberOnline || email == NULL)
return 0;
- char szServerName[100];
- if (JGetStaticString("Jud", NULL, szServerName, sizeof(szServerName)))
- strcpy(szServerName, "users.jabber.org");
+ ptrA szServerName( getStringA("Jud"));
int iqId = SerialNext();
IqAdd(iqId, IQ_PROC_GETSEARCH, &CJabberProto::OnIqResultSetSearch);
- m_ThreadInfo->send( XmlNodeIq(_T("set"), iqId, _A2T(szServerName)) << XQUERY(_T("jabber:iq:search"))
+ m_ThreadInfo->send( XmlNodeIq(_T("set"), iqId, _A2T(szServerName ? szServerName : "users.jabber.org")) << XQUERY(_T("jabber:iq:search"))
<< XCHILD(_T("email"), email));
return (HANDLE)iqId;
}
@@ -899,12 +897,10 @@ HANDLE __cdecl CJabberProto::SearchByName(const TCHAR *nick, const TCHAR *firstN
BOOL bIsExtFormat = m_options.ExtendedSearch;
- char szServerName[100];
- if (JGetStaticString("Jud", NULL, szServerName, sizeof(szServerName)))
- strcpy(szServerName, "users.jabber.org");
+ ptrA szServerName( getStringA("Jud"));
int iqId = SerialNext();
- XmlNodeIq iq(_T("set"), iqId, _A2T(szServerName));
+ XmlNodeIq iq(_T("set"), iqId, _A2T(szServerName ? szServerName : "users.jabber.org"));
HXML query = iq << XQUERY(_T("jabber:iq:search"));
if (bIsExtFormat) {