summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_privacy.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-20 14:33:10 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-20 14:33:10 +0000
commit83fa989e4ec503c4a8e82c097d4d464ff5495184 (patch)
tree85b67826287db1d6d4fe726c8fdd1c6311387c59 /protocols/JabberG/src/jabber_privacy.cpp
parent28de716d3ad748ffb6ee5987991ec011cdc63aa1 (diff)
- PS_GETCUSTOMSTATUSEX service for Jabber;
- further code cleaning. git-svn-id: http://svn.miranda-ng.org/main/trunk@2393 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_privacy.cpp')
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 7c879920d3..c5754fcd0d 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -479,11 +479,11 @@ public:
for (int i = 0; ; i++)
{
mir_snprintf(buf, 20, "%d", i);
- if (DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv))
+ if ( DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv))
break;
SendDlgItemMessage(m_hwnd, IDC_COMBO_VALUES, CB_ADDSTRING, 0, (LPARAM)&dbv.ptszVal[1]);
- DBFreeVariant(&dbv);
+ db_free(&dbv);
}
// FIXME: ugly code :)
@@ -1387,7 +1387,7 @@ bool CJabberDlgPrivacyLists::CListIsGroup(HANDLE hGroup)
DBVARIANT dbv;
bool result = DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv) == 0;
if (result)
- DBFreeVariant(&dbv);
+ db_free(&dbv);
return result;
}
@@ -1403,13 +1403,13 @@ HANDLE CJabberDlgPrivacyLists::CListFindGroupByName(TCHAR *name)
{
_itoa(i, idstr, 10);
- if (DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv))
+ if ( DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv))
break;
if ( !_tcscmp(dbv.ptszVal + 1, name))
hGroup = (HANDLE)(i+1);
- DBFreeVariant(&dbv);
+ db_free(&dbv);
}
return hGroup;
@@ -1610,7 +1610,7 @@ void CJabberDlgPrivacyLists::CListBuildList(HWND hwndList, CPrivacyList *pList)
char idstr[33];
_itoa(iGroup-1, idstr, 10);
DBVARIANT dbv = {0};
- if (DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv))
+ if ( DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv))
break;
hItem = m_clcClist.FindGroup((HANDLE)iGroup);
@@ -1621,7 +1621,7 @@ void CJabberDlgPrivacyLists::CListBuildList(HWND hwndList, CPrivacyList *pList)
if (dwPackets = CListGetPackets(hwndList, hItem, false))
pList->AddRule(Group, szJid, FALSE, dwOrder++, dwPackets);
- DBFreeVariant(&dbv);
+ db_free(&dbv);
}
hItem = clc_info.hItemSubBoth;