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_proto.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src/jabber_proto.cpp') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index d74ca56df1..2a10f808a9 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -120,8 +120,7 @@ CJabberProto::CJabberProto(const char* aProtoName, const TCHAR *aUserName) : JCreateService(PS_JOINCHAT, &CJabberProto::OnJoinChat); JCreateService(PS_LEAVECHAT, &CJabberProto::OnLeaveChat); - // not needed anymore and therefore commented out - // JCreateService(PS_GETXSTATUSEX, &CJabberProto::OnGetXStatusEx); + JCreateService(PS_GETCUSTOMSTATUSEX, &CJabberProto::OnGetXStatusEx); JCreateService(PS_SETCUSTOMSTATUSEX, &CJabberProto::OnSetXStatusEx); JCreateService(PS_GETCUSTOMSTATUSICON, &CJabberProto::OnGetXStatusIcon); JCreateService(PS_GETADVANCEDSTATUSICON, &CJabberProto::JGetAdvancedStatusIcon); @@ -215,7 +214,6 @@ CJabberProto::~CJabberProto() { WsUninit(); IqUninit(); - XStatusUninit(); SerialUninit(); ConsoleUninit(); GlobalMenuUninit(); @@ -503,7 +501,7 @@ int CJabberProto::Authorize(HANDLE hDbEvent) if ((hContact = AddToListByJID(newJid, 0)) != NULL) { // Trigger actual add by removing the "NotOnList" added by AddToListByJID() // See AddToListByJID() and JabberDbSettingChanged(). - DBDeleteContactSetting(hContact, "CList", "NotOnList"); + db_unset(hContact, "CList", "NotOnList"); } } } mir_free(newJid); -- cgit v1.2.3