From 8788bb35e10ef5403a08388d33ed4ab2ff7d67df Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 23 Jun 2013 12:32:12 +0000 Subject: new helper applied instead of MS_DB_SETSETTINGRESIDENT git-svn-id: http://svn.miranda-ng.org/main/trunk@5094 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/database/dbintf.cpp | 6 ------ src/modules/extraicons/ExtraIconGroup.cpp | 4 +--- src/modules/extraicons/IcolibExtraIcon.cpp | 4 +--- 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src/modules') diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index e95caff6c4..c1c69cece8 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -179,11 +179,6 @@ static INT_PTR srvEnumContactSettings(WPARAM wParam,LPARAM lParam) return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0; } -static INT_PTR srvSetSettingResident(WPARAM wParam,LPARAM lParam) -{ - return (currDb) ? (INT_PTR)currDb->SetSettingResident(wParam, (char*)lParam) : 0; -} - static INT_PTR srvEnumResidentSettings(WPARAM wParam,LPARAM lParam) { return (currDb) ? (INT_PTR)currDb->EnumResidentSettings((DBMODULEENUMPROC)wParam, (void*)lParam) : 0; @@ -274,7 +269,6 @@ int LoadDbintfModule() CreateServiceFunction(MS_DB_CONTACT_WRITESETTING, srvWriteContactSetting); CreateServiceFunction(MS_DB_CONTACT_DELETESETTING, srvDeleteContactSetting); CreateServiceFunction(MS_DB_CONTACT_ENUMSETTINGS, srvEnumContactSettings); - CreateServiceFunction(MS_DB_SETSETTINGRESIDENT, srvSetSettingResident); CreateServiceFunction("DB/ResidentSettings/Enum", srvEnumResidentSettings); CreateServiceFunction(MS_DB_REGISTER_PLUGIN, srvRegisterPlugin); diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/modules/extraicons/ExtraIconGroup.cpp index 5da0f4f9b3..696728e4e2 100644 --- a/src/modules/extraicons/ExtraIconGroup.cpp +++ b/src/modules/extraicons/ExtraIconGroup.cpp @@ -26,9 +26,7 @@ Boston, MA 02111-1307, USA. ExtraIconGroup::ExtraIconGroup(const char *_name) : ExtraIcon(_name), setValidExtraIcon(false), insideApply(false) { - char setting[512]; - mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, _name); - CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (WPARAM) setting); + db_set_resident(MODULE_NAME, _name); } ExtraIconGroup::~ExtraIconGroup() diff --git a/src/modules/extraicons/IcolibExtraIcon.cpp b/src/modules/extraicons/IcolibExtraIcon.cpp index dc20e94572..0b67630d17 100644 --- a/src/modules/extraicons/IcolibExtraIcon.cpp +++ b/src/modules/extraicons/IcolibExtraIcon.cpp @@ -30,9 +30,7 @@ IcolibExtraIcon::IcolibExtraIcon(int _id, const char *_name, const TCHAR *_descr MIRANDAHOOKPARAM _OnClick, LPARAM _param) : BaseExtraIcon(_id, _name, _description, _descIcon, _OnClick, _param) { - char setting[512]; - mir_snprintf(setting, SIZEOF(setting), "%s/%s", MODULE_NAME, _name); - CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (WPARAM) setting); + db_set_resident(MODULE_NAME, _name); } IcolibExtraIcon::~IcolibExtraIcon() -- cgit v1.2.3