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/AssocMgr/src/test.cpp | 2 +- plugins/AssocMgr/src/utils.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'plugins/AssocMgr') diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 2722545302..1175e20807 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -759,7 +759,7 @@ static int ServiceParseXmppURI(WPARAM wParam, LPARAM lParam) MCONTACT hContact; hContact = JabberHContactFromJID(jid); if (hContact == NULL) /* not yet implemented: show standard miranda dialog here */ - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); return 0; } /* add user subscription */ diff --git a/plugins/AssocMgr/src/utils.cpp b/plugins/AssocMgr/src/utils.cpp index 6028343440..6f2a90b8d1 100644 --- a/plugins/AssocMgr/src/utils.cpp +++ b/plugins/AssocMgr/src/utils.cpp @@ -110,16 +110,12 @@ static int EnumPrefixSettingsProc(const char *pszSetting,LPARAM lParam) // mir_free() the returned pSettings after use BOOL EnumDbPrefixSettings(const char *pszModule,const char *pszSettingPrefix,char ***pSettings,int *pnSettingsCount) { - DBCONTACTENUMSETTINGS dbces; struct EnumPrefixSettingsParams param; - dbces.szModule = pszModule; - dbces.pfnEnumProc = EnumPrefixSettingsProc; - dbces.lParam = (LPARAM)¶m; param.settings = NULL; param.nSettingsCount = 0; param.pszPrefix = pszSettingPrefix; param.nPrefixLen = (int)mir_strlen(pszSettingPrefix); - CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces); + db_enum_settings(NULL, EnumPrefixSettingsProc, pszModule, ¶m); *pnSettingsCount = param.nSettingsCount; *pSettings = param.settings; return param.nSettingsCount != 0; -- cgit v1.2.3