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 --- plugins/DbEditorPP/src/exportimport.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'plugins/DbEditorPP/src/exportimport.cpp') diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp index 18790a530c..a9f5d33b7f 100644 --- a/plugins/DbEditorPP/src/exportimport.cpp +++ b/plugins/DbEditorPP/src/exportimport.cpp @@ -356,18 +356,13 @@ void importSettings(MCONTACT hContact, char *utf8) // get the type type = *(end + 1); if (mir_strcmp(module, "CList") == 0 && mir_strcmp(setting, "Group") == 0) { - ptrA GroupName(mir_utf8decodeA(end + 2)); + ptrT GroupName(mir_utf8decodeT(end + 2)); if (!GroupName) continue; - HANDLE GroupHandle = (HANDLE)CallService(MS_CLIST_GROUPEXISTS, 0, LPARAM(GroupName)); - if (GroupHandle == 0) { - GroupHandle = (HANDLE)CallService(MS_CLIST_GROUPCREATE, 0, (LPARAM)GroupName); - if (GroupHandle) { - CallService(MS_CLUI_GROUPADDED, (WPARAM)GroupHandle, 0); - CallService(MS_CLIST_GROUPSETEXPANDED, (WPARAM)GroupHandle, 1); - } - } + MGROUP GroupHandle = Clist_GroupCreate(0, GroupName); + CallService(MS_CLUI_GROUPADDED, GroupHandle, 0); + Clist_GroupSetExpanded(GroupHandle, true); } switch (type) { -- cgit v1.2.3