diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-02-19 10:48:23 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-02-19 10:48:23 +0000 |
| commit | e1a01b5f23430304b900b9817fdcdfd12bc75808 (patch) | |
| tree | 26628a900ee7679785b853246e99a0754124f91b | |
| parent | 940d9acd86edda613e78d173129877decb4373d8 (diff) | |
- Create PopUp options pages only when popup plugin present
git-svn-id: http://svn.miranda-ng.org/main/trunk@3642 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/ClientChangeNotify/src/OptDlg.cpp | 22 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/popupOptions.cpp | 18 | ||||
| -rw-r--r-- | src/core/stdchat/src/options.cpp | 2 |
4 files changed, 24 insertions, 20 deletions
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index ac196f72c7..4a348a3d8b 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -172,16 +172,18 @@ INT_PTR CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara int OptionsDlgInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE optDi = {0};
- optDi.cbSize = sizeof(optDi);
- optDi.position = 920000000;
- optDi.ptszTitle = LPGENT("ClientChangeNotify");
- optDi.pfnDlgProc = PopupOptDlg;
- optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
- optDi.hInstance = g_hInstance;
- optDi.ptszGroup = LPGENT("PopUps");
- optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
- Options_AddPage(wParam, &optDi);
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
+ OPTIONSDIALOGPAGE optDi = {0};
+ optDi.cbSize = sizeof(optDi);
+ optDi.position = 920000000;
+ optDi.ptszTitle = LPGENT("ClientChangeNotify");
+ optDi.pfnDlgProc = PopupOptDlg;
+ optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
+ optDi.hInstance = g_hInstance;
+ optDi.ptszGroup = LPGENT("PopUps");
+ optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ Options_AddPage(wParam, &optDi);
+ }
return 0;
}
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 3cb5352cc0..163f687cb8 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -759,7 +759,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg,UINT uMsg,WPARAM wParam static int OptionsInitialize(WPARAM wParam, LPARAM lParam)
{
- if (g_dat->popupInstalled) {
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
OPTIONSDIALOGPAGE odp = {0};
odp.cbSize = sizeof(odp);
odp.position = 910000002;
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index 2b6ee87876..d0ac6983eb 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -225,14 +225,16 @@ void RefreshPopupOptionsDlg(HWND hec,HWND hdc,HWND hss,HWND hsr,HWND hks,HWND hk int onRegisterPopOptions(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = {0};
- odp.cbSize = sizeof(odp);
- odp.hInstance = g_hInst;
- odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
- odp.pszTitle = (char*)szModuleName;
- odp.pszGroup = LPGEN("PopUps");
- odp.pfnDlgProc = PopOptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
+ OPTIONSDIALOGPAGE odp = {0};
+ odp.cbSize = sizeof(odp);
+ odp.hInstance = g_hInst;
+ odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
+ odp.pszTitle = (char*)szModuleName;
+ odp.pszGroup = LPGEN("PopUps");
+ odp.pfnDlgProc = PopOptionsDlgProc;
+ Options_AddPage(wParam, &odp);
+ }
return 0;
}
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 8ad41172ce..678c4dfbda 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -922,7 +922,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcOptions2;
Options_AddPage(wParam, &odp);
- if (PopUpInstalled) {
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.position = 910000002;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
odp.pszTitle = LPGEN("Chat");
|