summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-10-21 15:13:56 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-10-21 15:13:56 +0000
commit34c11f2b4c3511476b2f09f3a438ce1f39d63bfd (patch)
tree88dbad1e6ca7dc7012bd4950fd9621fa0da29deb /protocols
parent646d3950702c34475e9bcb05ebe380f6874a73d2 (diff)
patch for eliminating expert mode in options (to replace the simple mode with ModernOpts)
git-svn-id: http://svn.miranda-ng.org/main/trunk@2025 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/AimOscar/src/ui.cpp2
-rw-r--r--protocols/FacebookRM/src/communication.cpp1
-rw-r--r--protocols/Gadu-Gadu/src/dialogs.cpp1
-rw-r--r--protocols/IRCG/src/options.cpp1
-rw-r--r--protocols/JabberG/src/jabber_opt.cpp2
-rw-r--r--protocols/MRA/src/MraPopUp.cpp1
6 files changed, 1 insertions, 7 deletions
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index d4a8116ecd..76b50b9741 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -1158,13 +1158,11 @@ int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
odp.ptszTab = LPGENT("Basic");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM);
odp.pfnDlgProc = options_dialog;
- odp.nIDBottomSimpleControl = IDC_OPTIONS;
Options_AddPage(wParam, &odp);
odp.ptszTab = LPGENT("Privacy");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY);
odp.pfnDlgProc = privacy_dialog;
- odp.nIDBottomSimpleControl = 0;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 19478d165a..121476b7ca 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -1133,6 +1133,7 @@ bool facebook_client::send_message( std::string message_recipient, std::string m
} break;
default: // Other error
+ parent->Log(" !!! Send message error #%d: %s", resp.error_number, resp.error_text);
return false;
}
diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp
index 345624715b..476907f2e8 100644
--- a/protocols/Gadu-Gadu/src/dialogs.cpp
+++ b/protocols/Gadu-Gadu/src/dialogs.cpp
@@ -148,7 +148,6 @@ int GGPROTO::options_init(WPARAM wParam, LPARAM lParam)
odp.ptszTab = LPGENT("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_ADVANCED);
odp.pfnDlgProc = gg_advoptsdlgproc;
- odp.flags |= ODPF_EXPERTONLY;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 69a991374b..4576574da4 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -1725,7 +1725,6 @@ int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM)
OptCreateAccount.param = this;
Options_AddPage(wParam, &odp);
- odp.flags |= ODPF_EXPERTONLY;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_CTCP);
odp.ptszTab = LPGENT("DCC'n CTCP");
odp.dwInitParam = (LPARAM)&OptCreateConn;
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 1f1270a8a1..6817435d7f 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -1622,8 +1622,6 @@ int CJabberProto::OnOptionsInit( WPARAM wParam, LPARAM )
OptCreateGc.param = this;
Options_AddPage(wParam, &odp);
- odp.flags |= ODPF_EXPERTONLY;
-
odp.ptszTab = LPGENT("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_JABBER2 );
odp.pfnDlgProc = CDlgBase::DynamicDlgProc;
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index af399eee9e..3260bf4aea 100644
--- a/protocols/MRA/src/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
@@ -138,7 +138,6 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM lParam)
odp.pszGroup = LPGEN("Popups");
odp.groupPosition = 900000000;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_GROUPMAIN;
odp.pfnDlgProc = MraPopupDlgProcOpts;
Options_AddPage(wParam, &odp);
}