From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MsgPopup/src/main.cpp | 8 ++++---- plugins/MsgPopup/src/options.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/MsgPopup') diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index bdc1a5ab5e..1319bd5c85 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -225,11 +225,11 @@ void LoadConfig() mir_snprintf(szNameFG, SIZEOF(szNameFG), "FG%d", indx); mir_snprintf(szNameBG, SIZEOF(szNameBG), "BG%d", indx); mir_snprintf(szNameTO, SIZEOF(szNameTO), "TO%d", indx); - options.FG[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameFG, optionsDefault.FG[indx]); - options.BG[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameBG, optionsDefault.BG[indx]); - options.Timeout[indx] = DBGetContactSettingDword(NULL, SERVICENAME, szNameTO, (DWORD)optionsDefault.Timeout[indx]); + options.FG[indx] = db_get_dw(NULL, SERVICENAME, szNameFG, optionsDefault.FG[indx]); + options.BG[indx] = db_get_dw(NULL, SERVICENAME, szNameBG, optionsDefault.BG[indx]); + options.Timeout[indx] = db_get_dw(NULL, SERVICENAME, szNameTO, (DWORD)optionsDefault.Timeout[indx]); } - options.Sound = DBGetContactSettingByte(NULL, SERVICENAME, "Sound", (DWORD)optionsDefault.Sound); + options.Sound = db_get_b(NULL, SERVICENAME, "Sound", (DWORD)optionsDefault.Sound); } extern "C" __declspec(dllexport) int Load(void) diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index 2b251b57ae..e9b5eca13d 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -30,10 +30,10 @@ int idOptionControls[4][3] = { static int __inline DBWriteContactSettingDwordDef(HANDLE hContact,const char *szModule,const char *szSetting,DWORD val, DWORD defValue) { - if(val == DBGetContactSettingDword(hContact, szModule, szSetting, defValue)) + if(val == db_get_dw(hContact, szModule, szSetting, defValue)) return 0; else - return DBWriteContactSettingDword(hContact, szModule, szSetting, val); + return db_set_dw(hContact, szModule, szSetting, val); } INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -- cgit v1.2.3