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_bookmarks.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_bookmarks.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_bookmarks.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index e025dbc5d0..e47575cf42 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -131,14 +131,10 @@ static INT_PTR CALLBACK JabberAddBookmarkDlgProc(HWND hwndDlg, UINT msg, WPARAM replaceStrT(item->name, (text[0] == 0) ? roomJID : text);
item->bAutoJoin = (SendDlgItemMessage(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BM_GETCHECK,0, 0) == BST_CHECKED);
- {
- int iqId = param->ppro->SerialNext();
- param->ppro->IqAdd(iqId, IQ_PROC_SETBOOKMARKS, &CJabberProto::OnIqResultSetBookmarks);
- XmlNodeIq iq(_T("set"), iqId);
- param->ppro->SetBookmarkRequest(iq);
- param->ppro->m_ThreadInfo->send(iq);
- }
+ XmlNodeIq iq( param->ppro->AddIQ(&CJabberProto::OnIqResultSetBookmarks, JABBER_IQ_TYPE_SET));
+ param->ppro->SetBookmarkRequest(iq);
+ param->ppro->m_ThreadInfo->send(iq);
}
// fall through
case IDCANCEL:
@@ -243,10 +239,7 @@ private: m_lvBookmarks.SetItemState(iItem, 0, LVIS_SELECTED); // Unselect the item
- int iqId = m_proto->SerialNext();
- m_proto->IqAdd(iqId, IQ_PROC_SETBOOKMARKS, &CJabberProto::OnIqResultSetBookmarks);
-
- XmlNodeIq iq(_T("set"), iqId);
+ XmlNodeIq iq( m_proto->AddIQ(&CJabberProto::OnIqResultSetBookmarks, JABBER_IQ_TYPE_SET));
m_proto->SetBookmarkRequest(iq);
m_proto->m_ThreadInfo->send(iq);
}
@@ -269,10 +262,9 @@ void CJabberDlgBookmarks::UpdateData() {
if ( !m_proto->m_bJabberOnline) return;
- int iqId = m_proto->SerialNext();
- m_proto->IqAdd(iqId, IQ_PROC_DISCOBOOKMARKS, &CJabberProto::OnIqResultDiscoBookmarks);
- m_proto->m_ThreadInfo->send( XmlNodeIq(_T("get"), iqId) << XQUERY(JABBER_FEAT_PRIVATE_STORAGE)
- << XCHILDNS(_T("storage"), _T("storage:bookmarks")));
+ m_proto->m_ThreadInfo->send(
+ XmlNodeIq( m_proto->AddIQ(&CJabberProto::OnIqResultDiscoBookmarks, JABBER_IQ_TYPE_GET))
+ << XQUERY(JABBER_FEAT_PRIVATE_STORAGE) << XCHILDNS(_T("storage"), _T("storage:bookmarks")));
}
void CJabberDlgBookmarks::OnInitDialog()
|