From 7bdb598e26e7e98788933af43090d34027166969 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Sep 2016 18:01:49 +0000 Subject: second major wipeout of database services & structures: - DBCONTACTENUMSETTINGS removed; - all helpers moved to mir_core.dll git-svn-id: http://svn.miranda-ng.org/main/trunk@17296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MenuItemEx/src/main.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'plugins/MenuItemEx/src') diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 7f40aa30fb..522b590739 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -159,17 +159,11 @@ void FreeModuleSettingLL(ModuleSettingLL* msll) void RenameDbProto(MCONTACT hContact, MCONTACT hContactNew, char* oldName, char* newName, int delOld) { DBVARIANT dbv; - ModuleSettingLL settinglist; struct ModSetLinkLinkItem *setting; - DBCONTACTENUMSETTINGS dbces; // enum all setting the contact has for the module - dbces.pfnEnumProc = enumModulesSettingsProc; - dbces.szModule = oldName; - dbces.lParam = (LPARAM)&settinglist; - settinglist.first = 0; - settinglist.last = 0; - CallService(MS_DB_CONTACT_ENUMSETTINGS, hContact, (LPARAM)&dbces); + ModuleSettingLL settinglist = { NULL, NULL }; + db_enum_settings(hContact, enumModulesSettingsProc, oldName, &settinglist); setting = settinglist.first; while (setting) { @@ -694,7 +688,7 @@ INT_PTR onChangeProto(WPARAM wparam, LPARAM lparam) Proto_AddToContact(hContactNew, (char*)lparam); } else { - hContactNew = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); + hContactNew = db_add_contact(); if (hContactNew) { Proto_AddToContact(hContactNew, (char*)lparam); RenameDbProto(hContact, hContactNew, GetContactProto(hContact), (char*)lparam, 0); -- cgit v1.2.3