From 18f7e9261c885e953f220ba6836e8bca43a6fc88 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Apr 2016 13:40:58 +0000 Subject: contact list groups: - finally database is not used anymore (only as a settings' storage); - MGROUP type introduced to replace HANDLE for group ids; - MS_CLIST_GROUP* services became Clist_Group* functions; - CLIST_INTERFACE members pfnGetGroupName & pfnRenameGroup also transformed into static Clist_Group* functions git-svn-id: http://svn.miranda-ng.org/main/trunk@16659 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/icq_servlist.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'protocols/IcqOscarJ') diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index 5229455a4c..1c1ea58350 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -1380,7 +1380,7 @@ int CIcqProto::getCListGroupExists(const char *szGroup) if (utf8_to_tchar_static(szGroup, tszGroup, size)) for (int i = 1; TRUE; i++) { - TCHAR *tszGroupName = (TCHAR*)pcli->pfnGetGroupName(i, NULL); + TCHAR *tszGroupName = (TCHAR*)Clist_GroupGetName(i, NULL); if (!tszGroupName) break; @@ -1395,12 +1395,8 @@ int CIcqProto::getCListGroupExists(const char *szGroup) int CIcqProto::moveContactToCListGroup(MCONTACT hContact, const char *szGroup) { - HANDLE hGroup = Clist_CreateGroup(0, ptrT(mir_utf8decodeT(szGroup))); - - if (ServiceExists(MS_CLIST_CONTACTCHANGEGROUP)) - return CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, (LPARAM)hGroup); - else /// TODO: is this neccessary ? - return db_set_utf(hContact, "CList", "Group", szGroup); + MGROUP hGroup = Clist_GroupCreate(0, ptrT(mir_utf8decodeT(szGroup))); + return CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, hGroup); } -- cgit v1.2.3