minus ModernOpt

4 files changed, 0 insertions, 29 deletions

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 406cd96227..ea582b2319 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -2216,29 +2216,3 @@ INT_PTR __cdecl CJabberProto::OnMenuOptions(WPARAM, LPARAM)
 	Options_Open(L"Network", m_tszUserName, L"Account");

 	return 0;

 }

-

-int CJabberProto::OnModernOptInit(WPARAM, LPARAM)

-{/*

-	static int iBoldControls[] =

-	{

-		IDC_TITLE1, MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = {0};

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR;

-	obj.hIcon = LoadIconEx("main");

-	obj.hInstance = hInst;

-	obj.iSection = MODERNOPT_PAGE_ACCOUNTS;

-	obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;

-	obj.lptzSubsection = mir_a2u(m_szModuleName);	// title!!!!!!!!!!!

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT);

-	obj.iBoldControls = iBoldControls;

-	obj.pfnDlgProc = JabberWizardDlgProc;

-	obj.lpszClassicGroup = "Network";

-	obj.lpszClassicPage = m_szModuleName;	// title!!!!!!!!!!!

-	obj.lpszHelpUrl = "https://miranda-ng.org/p/Jabber";

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	mir_free(obj.lptzSubsection); */

-	return 0;

-}

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index cba4d8cdeb..8f72686d41 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -119,7 +119,6 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
 	// XMPP URI parser service for "File Association Manager" plugin

 	CreateProtoService(JS_PARSE_XMPP_URI, &CJabberProto::JabberServiceParseXmppURI);

 

-	HookProtoEvent(ME_MODERNOPT_INITIALIZE, &CJabberProto::OnModernOptInit);

 	HookProtoEvent(ME_OPT_INITIALISE, &CJabberProto::OnOptionsInit);

 	HookProtoEvent(ME_SKIN2_ICONSCHANGED, &CJabberProto::OnReloadIcons);

 

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index a58a07ac8f..b0acd143a4 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -120,7 +120,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	int  __cdecl OnContactDeleted(WPARAM, LPARAM);

 	int  __cdecl OnDbSettingChanged(WPARAM, LPARAM);

 	int  __cdecl OnIdleChanged(WPARAM, LPARAM);

-	int  __cdecl OnModernOptInit(WPARAM, LPARAM);

 	int  __cdecl OnModulesLoadedEx(WPARAM, LPARAM);

 	int  __cdecl OnOptionsInit(WPARAM, LPARAM);

 	int  __cdecl OnPreShutdown(WPARAM, LPARAM);

diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index 5611ca6dcf..775df93f72 100644
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -92,7 +92,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_folders.h>

 #include <m_fingerprint.h>

 #include <m_jabber.h>

-#include <m_modernopt.h>

 #include <m_popup.h>

 #include <m_proto_listeningto.h>

 #include <m_nudge.h>