diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-02 19:38:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-02 19:38:44 +0000 |
| commit | 8fecb411c56387ef6db40abe96b8c935fddc6083 (patch) | |
| tree | 3aee9abef3610ab248bba34af1bd4878038d130f /protocols/JabberG/src/jabber_vcard.cpp | |
| parent | f7e58cf1bf50928ae22ffbdd9de99844407d5780 (diff) | |
atavism extincted: old nasty IQ handler mechanism
git-svn-id: http://svn.miranda-ng.org/main/trunk@6312 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_vcard.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_vcard.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index d479960324..c8b875165b 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -34,15 +34,11 @@ int CJabberProto::SendGetVcard(const TCHAR *jid) {
if ( !m_bJabberOnline) return 0;
- int iqId = SerialNext();
- JABBER_IQ_PROCID procId = !lstrcmp(jid, m_szJabberJID) ? IQ_PROC_GETVCARD : IQ_PROC_NONE;
+ CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultGetVcard, JABBER_IQ_TYPE_GET, jid);
+ m_ThreadInfo->send( XmlNodeIq(pInfo) << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP)
+ << XATTR(_T("prodid"), _T("-//HandGen//NONSGML vGen v1.0//EN")) << XATTR(_T("version"), _T("2.0")));
- IqAdd(iqId, procId, &CJabberProto::OnIqResultGetVcard);
- m_ThreadInfo->send(
- XmlNodeIq(_T("get"), iqId, jid) << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP)
- << XATTR(_T("prodid"), _T("-//HandGen//NONSGML vGen v1.0//EN")) << XATTR(_T("version"), _T("2.0")));
-
- return iqId;
+ return pInfo->GetIqId();
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1033,16 +1029,12 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName) if ( !m_bJabberOnline) return;
DBVARIANT dbv;
- int iqId;
TCHAR *szFileName;
int i;
char idstr[33];
WORD nFlag;
- iqId = SerialNext();
- IqAdd(iqId, IQ_PROC_SETVCARD, &CJabberProto::OnIqResultSetVcard);
-
- XmlNodeIq iq(_T("set"), iqId);
+ XmlNodeIq iq( AddIQ(&CJabberProto::OnIqResultSetVcard, JABBER_IQ_TYPE_SET));
HXML v = iq << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP);
AppendVcardFromDB(v, "FN", "FullName");
@@ -1056,7 +1048,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName) AppendVcardFromDB(v, "BDAY", "BirthDate");
AppendVcardFromDB(v, "GENDER", "GenderString");
- for (i=0;;i++) {
+ for (i=0; ; i++) {
mir_snprintf(idstr, SIZEOF(idstr), "e-mail%d", i);
if ( getTString(idstr, &dbv))
break;
@@ -1104,7 +1096,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName) AppendVcardFromDB(v, "URL", "Homepage");
AppendVcardFromDB(v, "DESC", "About");
- for (i=0;;i++) {
+ for (i=0; ; i++) {
mir_snprintf(idstr, SIZEOF(idstr), "Phone%d", i);
if ( getTString(idstr, &dbv)) break;
db_free(&dbv);
|