diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-02-18 09:18:15 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-02-18 09:18:15 +0000 |
| commit | 0af8e937d7c37f71beb9fb17d45c5ac89a8500b0 (patch) | |
| tree | 7498f2295167a88b714ac0c2efc95cc0d32e7923 | |
| parent | 8194a961aacbaefaa5580a82e5578f5edcd64729 (diff) | |
- Create PopUp options pages only when popup plugin present
git-svn-id: http://svn.miranda-ng.org/main/trunk@3626 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TabSRMM/src/msgoptions.cpp | 12 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/typingnotify.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_opts.cpp | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 06132af3e0..be168ccc19 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1325,11 +1325,13 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcTypeOptions;
Options_AddPage(wParam, &odp);
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPT);
- odp.pszTitle = LPGEN("Event notifications");
- odp.pszGroup = LPGEN("PopUps");
- odp.pfnDlgProc = DlgProcPopupOpts;
- Options_AddPage(wParam, &odp);
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPT);
+ odp.pszTitle = LPGEN("Event notifications");
+ odp.pszGroup = LPGEN("PopUps");
+ odp.pfnDlgProc = DlgProcPopupOpts;
+ Options_AddPage(wParam, &odp);
+ }
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
odp.pszTitle = LPGEN("Message window");
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index e314058636..5078b69666 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -490,7 +490,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam)
{
- if (PluginConfig.g_PopupAvail) {
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.cbSize = sizeof(odp);
odp.position = 100000000;
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index e43d1dc719..3210593753 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -606,7 +606,7 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcIcqPrivacyOpts;
Options_AddPage(wParam, &odp);
- if (bPopUpService) {
+ if (ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.position = 100000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
odp.groupPosition = 900000000;
|