From 83fa989e4ec503c4a8e82c097d4d464ff5495184 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 20 Nov 2012 14:33:10 +0000 Subject: - PS_GETCUSTOMSTATUSEX service for Jabber; - further code cleaning. git-svn-id: http://svn.miranda-ng.org/main/trunk@2393 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_iq_handlers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src/jabber_iq_handlers.cpp') diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index 11052adb22..760267d5ee 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -606,13 +606,13 @@ BOOL CJabberProto::OnRosterPushRequest(HXML, CJabberIqInfo *pInfo) if (_tcscmp(nick, dbnick.ptszVal) != 0) db_set_ts(hContact, "CList", "MyHandle", nick); else - DBDeleteContactSetting(hContact, "CList", "MyHandle"); + db_unset(hContact, "CList", "MyHandle"); db_free(&dbnick); } else db_set_ts(hContact, "CList", "MyHandle", nick); } - else DBDeleteContactSetting(hContact, "CList", "MyHandle"); + else db_unset(hContact, "CList", "MyHandle"); if ( !m_options.IgnoreRosterGroups) { @@ -621,7 +621,7 @@ BOOL CJabberProto::OnRosterPushRequest(HXML, CJabberIqInfo *pInfo) db_set_ts(hContact, "CList", "Group", item->group); } else - DBDeleteContactSetting(hContact, "CList", "Group"); + db_unset(hContact, "CList", "Group"); } } mir_free(nick); @@ -642,7 +642,7 @@ BOOL CJabberProto::OnRosterPushRequest(HXML, CJabberIqInfo *pInfo) ListRemove(LIST_ROSTER, jid); } } else if (JGetByte(hContact, "ChatRoom", 0)) - DBDeleteContactSetting(hContact, "CList", "Hidden"); + db_unset(hContact, "CList", "Hidden"); else UpdateSubscriptionInfo(hContact, item); } } -- cgit v1.2.3