diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-27 21:40:31 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-27 21:40:31 +0000 |
| commit | d4c7112ac94d71397957c2bab796167cc91532fd (patch) | |
| tree | bc9ea58842d4f609a764388ac892e9d3e42ac2cc /protocols/JabberG/src/jabber_menu.cpp | |
| parent | bd6b5abd84459ee4aaced4a99c05de6a8e849285 (diff) | |
code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@6255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_menu.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index f15770ead0..2c9fef4f4e 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -534,43 +534,34 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM wParam, LPARAM) INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM wParam, LPARAM)
{
- HANDLE hContact;
- DBVARIANT dbv;
-
- if ((hContact=(HANDLE)wParam) != NULL && m_bJabberOnline) {
- if ( !getTString(hContact, "jid", &dbv)) {
- m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), dbv.ptszVal) << XATTR(_T("type"), _T("subscribe")));
- db_free(&dbv);
- } }
-
+ HANDLE hContact = (HANDLE)wParam;
+ if (hContact != NULL && m_bJabberOnline) {
+ ptrT jid( getTStringA(hContact, "jid"));
+ if (jid != NULL)
+ m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), jid) << XATTR(_T("type"), _T("subscribe")));
+ }
return 0;
}
INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM wParam, LPARAM)
{
- HANDLE hContact;
- DBVARIANT dbv;
-
- if ((hContact=(HANDLE)wParam) != NULL && m_bJabberOnline) {
- if ( !getTString(hContact, "jid", &dbv)) {
- m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), dbv.ptszVal) << XATTR(_T("type"), _T("subscribed")));
- db_free(&dbv);
- } }
-
+ HANDLE hContact = (HANDLE)wParam;
+ if (hContact != NULL && m_bJabberOnline) {
+ ptrT jid( getTStringA(hContact, "jid"));
+ if (jid != NULL)
+ m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), jid) << XATTR(_T("type"), _T("subscribed")));
+ }
return 0;
}
INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM wParam, LPARAM)
{
- HANDLE hContact;
- DBVARIANT dbv;
-
- if ((hContact=(HANDLE)wParam) != NULL && m_bJabberOnline) {
- if ( !getTString(hContact, "jid", &dbv)) {
- m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), dbv.ptszVal) << XATTR(_T("type"), _T("unsubscribed")));
- db_free(&dbv);
- } }
-
+ HANDLE hContact = (HANDLE)wParam;
+ if (hContact != NULL && m_bJabberOnline) {
+ ptrT jid( getTStringA(hContact, "jid"));
+ if (jid != NULL)
+ m_ThreadInfo->send(XmlNode(_T("presence")) << XATTR(_T("to"), jid) << XATTR(_T("type"), _T("unsubscribed")));
+ }
return 0;
}
|