From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 20 May 2018 15:08:48 +0300 Subject: CMPlugin to receive a reference to PLUGININFOEX --- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 86 +++++++++++--------- plugins/BuddyExpectator/src/options.cpp | 104 ++++++++++++------------ plugins/BuddyExpectator/src/stdafx.h | 6 +- 3 files changed, 101 insertions(+), 95 deletions(-) (limited to 'plugins/BuddyExpectator') diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 4b8d9fab79..44b2c1b7b7 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -38,7 +38,18 @@ POPUPACTION hideactions[2]; extern int UserinfoInit(WPARAM wparam, LPARAM lparam); -PLUGININFOEX pluginInfo = { +static IconItem iconList[] = +{ + { LPGEN("Tray/popup icon"), "main_icon", IDI_MAINICON }, + { LPGEN("Enabled"), "enabled_icon", IDI_ENABLED }, + { LPGEN("Disabled"), "disabled_icon", IDI_DISABLED }, + { LPGEN("Hide"), "hide_icon", IDI_HIDE }, + { LPGEN("Never hide"), "neverhide_icon", IDI_NEVERHIDE } +}; + +///////////////////////////////////////////////////////////////////////////////////////// + +PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), @@ -48,28 +59,30 @@ PLUGININFOEX pluginInfo = { __AUTHORWEB, UNICODE_AWARE, // {DDF8AEC9-7D37-49AF-9D22-BBBC920E6F05} - { 0xddf8aec9, 0x7d37, 0x49af, { 0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05 } } + {0xddf8aec9, 0x7d37, 0x49af, {0x9d, 0x22, 0xbb, 0xbc, 0x92, 0x0e, 0x6f, 0x05}} }; -static IconItem iconList[] = +CMPlugin::CMPlugin() : + PLUGIN(MODULENAME, pluginInfoEx) +{} + +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - { LPGEN("Tray/popup icon"), "main_icon", IDI_MAINICON }, - { LPGEN("Enabled"), "enabled_icon", IDI_ENABLED }, - { LPGEN("Disabled"), "disabled_icon", IDI_DISABLED }, - { LPGEN("Hide"), "hide_icon", IDI_HIDE }, - { LPGEN("Never hide"), "neverhide_icon", IDI_NEVERHIDE } -}; + return &pluginInfoEx; +} + +///////////////////////////////////////////////////////////////////////////////////////// time_t getLastSeen(MCONTACT hContact) { - return db_get_dw(hContact, MODULE_NAME, "LastSeen", db_get_dw(hContact, MODULE_NAME, "CreationTime", (DWORD)-1)); + return db_get_dw(hContact, MODULENAME, "LastSeen", db_get_dw(hContact, MODULENAME, "CreationTime", (DWORD)-1)); } void setLastSeen(MCONTACT hContact) { - db_set_dw(hContact, MODULE_NAME, "LastSeen", (DWORD)time(0)); - if (db_get_b(hContact, MODULE_NAME, "StillAbsentNotified", 0)) - db_set_b(hContact, MODULE_NAME, "StillAbsentNotified", 0); + db_set_dw(hContact, MODULENAME, "LastSeen", (DWORD)time(0)); + if (db_get_b(hContact, MODULENAME, "StillAbsentNotified", 0)) + db_set_b(hContact, MODULENAME, "StillAbsentNotified", 0); } time_t getLastInputMsg(MCONTACT hContact) @@ -100,7 +113,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM break; case WM_CONTEXTMENU: - db_set_b(PUGetContact(hWnd), MODULE_NAME, "NeverHide", 1); + db_set_b(PUGetContact(hWnd), MODULENAME, "NeverHide", 1); PUDeletePopup(hWnd); break; @@ -110,7 +123,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM PUDeletePopup(hWnd); } if (wParam == 3) { - db_set_b(PUGetContact(hWnd), MODULE_NAME, "NeverHide", 1); + db_set_b(PUGetContact(hWnd), MODULENAME, "NeverHide", 1); PUDeletePopup(hWnd); } break; @@ -127,8 +140,8 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA case WM_COMMAND: if (HIWORD(wParam) == STN_CLICKED) { CallServiceSync("BuddyExpectator/actionMissYou", (WPARAM)PUGetContact(hWnd), 0); - if (!db_get_b(PUGetContact(hWnd), MODULE_NAME, "MissYouNotifyAlways", 0)) { - db_set_b(PUGetContact(hWnd), MODULE_NAME, "MissYou", 0); + if (!db_get_b(PUGetContact(hWnd), MODULENAME, "MissYouNotifyAlways", 0)) { + db_set_b(PUGetContact(hWnd), MODULENAME, "MissYou", 0); ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd)); } PUDeletePopup(hWnd); @@ -141,7 +154,7 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA case UM_POPUPACTION: if (wParam == 1) { - db_set_b(PUGetContact(hWnd), MODULE_NAME, "MissYou", 0); + db_set_b(PUGetContact(hWnd), MODULENAME, "MissYou", 0); ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd)); PUDeletePopup(hWnd); } @@ -217,7 +230,7 @@ bool isContactGoneFor(MCONTACT hContact, int days) if (options.hideInactive) if (daysSinceMessage >= options.iSilencePeriod) - if (!db_get_b(hContact, "CList", "Hidden", 0) && !db_get_b(hContact, MODULE_NAME, "NeverHide", 0)) { + if (!db_get_b(hContact, "CList", "Hidden", 0) && !db_get_b(hContact, MODULENAME, "NeverHide", 0)) { POPUPDATAT_V2 ppd = { 0 }; ppd.cbSize = sizeof(ppd); ppd.lchContact = hContact; @@ -405,12 +418,12 @@ int onIconsChanged(WPARAM, LPARAM) */ INT_PTR MenuMissYouClick(WPARAM hContact, LPARAM) { - if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) { - db_set_b(hContact, MODULE_NAME, "MissYou", 0); + if (db_get_b(hContact, MODULENAME, "MissYou", 0)) { + db_set_b(hContact, MODULENAME, "MissYou", 0); ExtraIcon_Clear(hExtraIcon, hContact); } else { - db_set_b(hContact, MODULE_NAME, "MissYou", 1); + db_set_b(hContact, MODULENAME, "MissYou", 1); ExtraIcon_SetIconByName(hExtraIcon, hContact, "enabled_icon"); } @@ -426,7 +439,7 @@ int onPrebuildContactMenu(WPARAM hContact, LPARAM) if (!proto) return 0; - if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) + if (db_get_b(hContact, MODULENAME, "MissYou", 0)) Menu_ModifyItem(hContactMenu, LPGENW("Disable Miss You"), iconList[1].hIcolib); else Menu_ModifyItem(hContactMenu, LPGENW("Enable Miss You"), iconList[2].hIcolib); @@ -437,7 +450,7 @@ int onPrebuildContactMenu(WPARAM hContact, LPARAM) int onExtraImageApplying(WPARAM hContact, LPARAM) { - if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) + if (db_get_b(hContact, MODULENAME, "MissYou", 0)) ExtraIcon_SetIconByName(hExtraIcon, hContact, "enabled_icon"); return 0; @@ -467,10 +480,10 @@ int SettingChanged(WPARAM hContact, LPARAM lParam) return 0; // Last status - db_set_dw(hContact, MODULE_NAME, "LastStatus", prevStatus); + db_set_dw(hContact, MODULENAME, "LastStatus", prevStatus); if (prevStatus == ID_STATUS_OFFLINE) { - if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) { + if (db_get_b(hContact, MODULENAME, "MissYou", 0)) { // Display Popup POPUPDATAT_V2 ppd = { 0 }; ppd.cbSize = sizeof(ppd); @@ -502,12 +515,12 @@ int SettingChanged(WPARAM hContact, LPARAM lParam) return 0; } - if (db_get_dw(hContact, MODULE_NAME, "LastSeen", (DWORD)-1) == (DWORD)-1 && options.notifyFirstOnline) { + if (db_get_dw(hContact, MODULENAME, "LastSeen", (DWORD)-1) == (DWORD)-1 && options.notifyFirstOnline) { ReturnNotify(hContact, TranslateT("has gone online for the first time.")); setLastSeen(hContact); } - unsigned int AbsencePeriod = db_get_dw(hContact, MODULE_NAME, "iAbsencePeriod", options.iAbsencePeriod); + unsigned int AbsencePeriod = db_get_dw(hContact, MODULENAME, "iAbsencePeriod", options.iAbsencePeriod); if (isContactGoneFor(hContact, AbsencePeriod)) { wchar_t* message = TranslateT("has returned after a long absence."); wchar_t tmpBuf[251] = { 0 }; @@ -538,9 +551,9 @@ void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) { for (auto &hContact : Contacts()) { char *proto = GetContactProto(hContact); - if (proto && (db_get_b(hContact, proto, "ChatRoom", 0) == 0) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND) && isContactGoneFor(hContact, options.iAbsencePeriod2) && (db_get_b(hContact, MODULE_NAME, "StillAbsentNotified", 0) == 0)) + if (proto && (db_get_b(hContact, proto, "ChatRoom", 0) == 0) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND) && isContactGoneFor(hContact, options.iAbsencePeriod2) && (db_get_b(hContact, MODULENAME, "StillAbsentNotified", 0) == 0)) { - db_set_b(hContact, MODULE_NAME, "StillAbsentNotified", 1); + db_set_b(hContact, MODULENAME, "StillAbsentNotified", 1); Skin_PlaySound("buddyExpectatorStillAbsent"); wchar_t* message = TranslateT("has not returned after a long absence."); @@ -627,14 +640,9 @@ int ModulesLoaded(WPARAM, LPARAM) return 0; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) -{ - return &pluginInfo; -} - int ContactAdded(WPARAM hContact, LPARAM) { - db_set_dw(hContact, MODULE_NAME, "CreationTime", (DWORD)time(0)); + db_set_dw(hContact, MODULENAME, "CreationTime", (DWORD)time(0)); return 0; } @@ -646,7 +654,7 @@ int onShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfo); + mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); InitOptions(); @@ -667,10 +675,10 @@ extern "C" int __declspec(dllexport) Load(void) DWORD current_time = (DWORD)time(0); for (auto &hContact : Contacts()) { - if (!db_get(hContact, MODULE_NAME, "CreationTime", &dbv)) + if (!db_get(hContact, MODULENAME, "CreationTime", &dbv)) db_free(&dbv); else - db_set_dw(hContact, MODULE_NAME, "CreationTime", current_time); + db_set_dw(hContact, MODULENAME, "CreationTime", current_time); } g_plugin.registerIcon("BuddyExpectator", iconList); diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 576fabd1dd..34f4b98bf9 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -32,57 +32,57 @@ Options options; void LoadOptions() { - options.iAbsencePeriod = db_get_dw(NULL, MODULE_NAME, "iAbsencePeriod", 14); - options.iAbsencePeriod2 = db_get_dw(NULL, MODULE_NAME, "iAbsencePeriod2", 30 * 3); - options.iSilencePeriod = db_get_dw(NULL, MODULE_NAME, "iSilencePeriod", 30); - - options.iShowPopup = db_get_b(NULL, MODULE_NAME, "iShowPopUp", 1); - options.iShowEvent = db_get_b(NULL, MODULE_NAME, "iShowEvent", 0); - options.iShowUDetails = db_get_b(NULL, MODULE_NAME, "iShowUDetails", 0); - options.iShowMessageWindow = db_get_b(NULL, MODULE_NAME, "iShowMessageWindow", 1); - - options.iPopupColorBack = db_get_dw(NULL, MODULE_NAME, "iPopUpColorBack", DEF_COLOR_BACK); - options.iPopupColorFore = db_get_dw(NULL, MODULE_NAME, "iPopUpColorFore", DEF_COLOR_FORE); - - options.iUsePopupColors = db_get_b(NULL, MODULE_NAME, "iUsePopupColors", 0); - options.iUseWinColors = db_get_b(NULL, MODULE_NAME, "iUseWinColors", 0); - options.iPopupDelay = db_get_b(NULL, MODULE_NAME, "iPopUpDelay", 0); - - options.iShowPopup2 = db_get_b(NULL, MODULE_NAME, "iShowPopUp2", 1); - options.iShowEvent2 = db_get_b(NULL, MODULE_NAME, "iShowEvent2", 0); - options.action2 = (GoneContactAction)db_get_b(NULL, MODULE_NAME, "Action2", (BYTE)GCA_NOACTION); - options.notifyFirstOnline = db_get_b(NULL, MODULE_NAME, "bShowFirstSight", 0) ? true : false; - options.hideInactive = db_get_b(NULL, MODULE_NAME, "bHideInactive", 0) ? true : false; - options.enableMissYou = db_get_b(NULL, MODULE_NAME, "bMissYouEnabled", 1) ? true : false; + options.iAbsencePeriod = db_get_dw(NULL, MODULENAME, "iAbsencePeriod", 14); + options.iAbsencePeriod2 = db_get_dw(NULL, MODULENAME, "iAbsencePeriod2", 30 * 3); + options.iSilencePeriod = db_get_dw(NULL, MODULENAME, "iSilencePeriod", 30); + + options.iShowPopup = db_get_b(NULL, MODULENAME, "iShowPopUp", 1); + options.iShowEvent = db_get_b(NULL, MODULENAME, "iShowEvent", 0); + options.iShowUDetails = db_get_b(NULL, MODULENAME, "iShowUDetails", 0); + options.iShowMessageWindow = db_get_b(NULL, MODULENAME, "iShowMessageWindow", 1); + + options.iPopupColorBack = db_get_dw(NULL, MODULENAME, "iPopUpColorBack", DEF_COLOR_BACK); + options.iPopupColorFore = db_get_dw(NULL, MODULENAME, "iPopUpColorFore", DEF_COLOR_FORE); + + options.iUsePopupColors = db_get_b(NULL, MODULENAME, "iUsePopupColors", 0); + options.iUseWinColors = db_get_b(NULL, MODULENAME, "iUseWinColors", 0); + options.iPopupDelay = db_get_b(NULL, MODULENAME, "iPopUpDelay", 0); + + options.iShowPopup2 = db_get_b(NULL, MODULENAME, "iShowPopUp2", 1); + options.iShowEvent2 = db_get_b(NULL, MODULENAME, "iShowEvent2", 0); + options.action2 = (GoneContactAction)db_get_b(NULL, MODULENAME, "Action2", (BYTE)GCA_NOACTION); + options.notifyFirstOnline = db_get_b(NULL, MODULENAME, "bShowFirstSight", 0) ? true : false; + options.hideInactive = db_get_b(NULL, MODULENAME, "bHideInactive", 0) ? true : false; + options.enableMissYou = db_get_b(NULL, MODULENAME, "bMissYouEnabled", 1) ? true : false; } void SaveOptions() { - db_set_dw(NULL, MODULE_NAME, "iAbsencePeriod", options.iAbsencePeriod); - db_set_dw(NULL, MODULE_NAME, "iAbsencePeriod2", options.iAbsencePeriod2); - db_set_dw(NULL, MODULE_NAME, "iSilencePeriod", options.iSilencePeriod); - - db_set_b(NULL, MODULE_NAME, "iShowPopUp", options.iShowPopup); - db_set_b(NULL, MODULE_NAME, "iShowEvent", options.iShowEvent); - db_set_b(NULL, MODULE_NAME, "iShowUDetails", options.iShowUDetails); - db_set_b(NULL, MODULE_NAME, "iShowMessageWindow", options.iShowMessageWindow); - - db_set_b(NULL, MODULE_NAME, "iShowPopUp2", options.iShowPopup2); - db_set_b(NULL, MODULE_NAME, "iShowEvent2", options.iShowEvent2); - db_set_b(NULL, MODULE_NAME, "Action2", (BYTE)options.action2); - db_set_b(NULL, MODULE_NAME, "bShowFirstSight", options.notifyFirstOnline ? 1 : 0); - db_set_b(NULL, MODULE_NAME, "bHideInactive", options.hideInactive ? 1 : 0); - db_set_b(NULL, MODULE_NAME, "bMissYouEnabled", options.enableMissYou ? 1 : 0); + db_set_dw(NULL, MODULENAME, "iAbsencePeriod", options.iAbsencePeriod); + db_set_dw(NULL, MODULENAME, "iAbsencePeriod2", options.iAbsencePeriod2); + db_set_dw(NULL, MODULENAME, "iSilencePeriod", options.iSilencePeriod); + + db_set_b(NULL, MODULENAME, "iShowPopUp", options.iShowPopup); + db_set_b(NULL, MODULENAME, "iShowEvent", options.iShowEvent); + db_set_b(NULL, MODULENAME, "iShowUDetails", options.iShowUDetails); + db_set_b(NULL, MODULENAME, "iShowMessageWindow", options.iShowMessageWindow); + + db_set_b(NULL, MODULENAME, "iShowPopUp2", options.iShowPopup2); + db_set_b(NULL, MODULENAME, "iShowEvent2", options.iShowEvent2); + db_set_b(NULL, MODULENAME, "Action2", (BYTE)options.action2); + db_set_b(NULL, MODULENAME, "bShowFirstSight", options.notifyFirstOnline ? 1 : 0); + db_set_b(NULL, MODULENAME, "bHideInactive", options.hideInactive ? 1 : 0); + db_set_b(NULL, MODULENAME, "bMissYouEnabled", options.enableMissYou ? 1 : 0); } void SavePopupOptions() { - db_set_dw(NULL, MODULE_NAME, "iPopUpColorBack", options.iPopupColorBack); - db_set_dw(NULL, MODULE_NAME, "iPopUpColorFore", options.iPopupColorFore); + db_set_dw(NULL, MODULENAME, "iPopUpColorBack", options.iPopupColorBack); + db_set_dw(NULL, MODULENAME, "iPopUpColorFore", options.iPopupColorFore); - db_set_b(NULL, MODULE_NAME, "iUsePopupColors", options.iUsePopupColors); - db_set_b(NULL, MODULE_NAME, "iUseWinColors", options.iUseWinColors); - db_set_b(NULL, MODULE_NAME, "iPopUpDelay", options.iPopupDelay); + db_set_b(NULL, MODULENAME, "iUsePopupColors", options.iUsePopupColors); + db_set_b(NULL, MODULENAME, "iUseWinColors", options.iUseWinColors); + db_set_b(NULL, MODULENAME, "iPopUpDelay", options.iPopupDelay); } /** @@ -247,8 +247,8 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, // clear all notified settings for (auto &hContact : Contacts()) - if (db_get_b(hContact, MODULE_NAME, "StillAbsentNotified", 0)) - db_set_b(hContact, MODULE_NAME, "StillAbsentNotified", 0); + if (db_get_b(hContact, MODULENAME, "StillAbsentNotified", 0)) + db_set_b(hContact, MODULENAME, "StillAbsentNotified", 0); // restart timer & run check KillTimer(nullptr, timer_id); @@ -473,7 +473,7 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar SetDlgItemText(hdlg, IDC_EDIT_LASTINPUT, tmpBuf); } - unsigned int AbsencePeriod = db_get_dw((MCONTACT)lparam, MODULE_NAME, "iAbsencePeriod", options.iAbsencePeriod); + unsigned int AbsencePeriod = db_get_dw((MCONTACT)lparam, MODULENAME, "iAbsencePeriod", options.iAbsencePeriod); SendDlgItemMessage(hdlg, IDC_SPINABSENCE, UDM_SETRANGE, 0, MAKELONG(999, 1)); SetDlgItemInt(hdlg, IDC_EDITABSENCE, AbsencePeriod, FALSE); @@ -483,9 +483,9 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar else SetDlgItemText(hdlg, IDC_EDIT_WILLNOTICE, L""); - CheckDlgButton(hdlg, IDC_CHECK_MISSYOU, db_get_b((MCONTACT)lparam, MODULE_NAME, "MissYou", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hdlg, IDC_CHECK_NOTIFYALWAYS, db_get_b((MCONTACT)lparam, MODULE_NAME, "MissYouNotifyAlways", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hdlg, IDC_CHECK_NEVERHIDE, db_get_b((MCONTACT)lparam, MODULE_NAME, "NeverHide", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_MISSYOU, db_get_b((MCONTACT)lparam, MODULENAME, "MissYou", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_NOTIFYALWAYS, db_get_b((MCONTACT)lparam, MODULENAME, "MissYouNotifyAlways", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_NEVERHIDE, db_get_b((MCONTACT)lparam, MODULENAME, "NeverHide", 0) ? BST_CHECKED : BST_UNCHECKED); TranslateDialogDefault(hdlg); return TRUE; @@ -502,10 +502,10 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lparam)->lParam; if (hContact) { - db_set_dw(hContact, MODULE_NAME, "iAbsencePeriod", GetDlgItemInt(hdlg, IDC_EDITABSENCE, nullptr, FALSE)); - db_set_b(hContact, MODULE_NAME, "MissYou", (IsDlgButtonChecked(hdlg, IDC_CHECK_MISSYOU) == BST_CHECKED) ? 1 : 0); - db_set_b(hContact, MODULE_NAME, "MissYouNotifyAlways", (IsDlgButtonChecked(hdlg, IDC_CHECK_NOTIFYALWAYS) == BST_CHECKED) ? 1 : 0); - db_set_b(hContact, MODULE_NAME, "NeverHide", (IsDlgButtonChecked(hdlg, IDC_CHECK_NEVERHIDE) == BST_CHECKED) ? 1 : 0); + db_set_dw(hContact, MODULENAME, "iAbsencePeriod", GetDlgItemInt(hdlg, IDC_EDITABSENCE, nullptr, FALSE)); + db_set_b(hContact, MODULENAME, "MissYou", (IsDlgButtonChecked(hdlg, IDC_CHECK_MISSYOU) == BST_CHECKED) ? 1 : 0); + db_set_b(hContact, MODULENAME, "MissYouNotifyAlways", (IsDlgButtonChecked(hdlg, IDC_CHECK_NOTIFYALWAYS) == BST_CHECKED) ? 1 : 0); + db_set_b(hContact, MODULENAME, "NeverHide", (IsDlgButtonChecked(hdlg, IDC_CHECK_NEVERHIDE) == BST_CHECKED) ? 1 : 0); } break; } diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h index ba7a01892f..73eef9d564 100644 --- a/plugins/BuddyExpectator/src/stdafx.h +++ b/plugins/BuddyExpectator/src/stdafx.h @@ -45,13 +45,11 @@ #include "options.h" #include "version.h" -#define MODULE_NAME "BuddyExpectator" +#define MODULENAME "BuddyExpectator" struct CMPlugin : public PLUGIN { - CMPlugin() : - PLUGIN(MODULE_NAME) - {} + CMPlugin(); }; extern HANDLE hExtraIcon; -- cgit v1.2.3