Jabber: remove preset for Odnoklassniki (finally fixes #3215)

1 files changed, 1 insertions, 20 deletions

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index b1cd46297f..5911b2a56c 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -917,7 +917,7 @@ public:
 	}

 

 protected:

-	enum { ACC_PUBLIC, ACC_TLS, ACC_SSL, ACC_HIPCHAT, ACC_LJTALK, ACC_LOL_EN, ACC_LOL_EW, ACC_LOL_OC, ACC_LOL_US, ACC_OK, ACC_SMS };

+	enum { ACC_PUBLIC, ACC_TLS, ACC_SSL, ACC_HIPCHAT, ACC_LJTALK, ACC_LOL_EN, ACC_LOL_EW, ACC_LOL_OC, ACC_LOL_US, ACC_SMS };

 

 	bool OnInitDialog() override

 	{

@@ -957,7 +957,6 @@ protected:
 		m_cbType.AddString(TranslateT("League Of Legends (EU West)"), ACC_LOL_EW);

 		m_cbType.AddString(TranslateT("League Of Legends (Oceania)"), ACC_LOL_OC);

 		m_cbType.AddString(TranslateT("League Of Legends (US)"), ACC_LOL_US);

-		m_cbType.AddString(TranslateT("Odnoklassniki"), ACC_OK);

 		m_cbType.AddString(TranslateT("S.ms"), ACC_SMS);

 

 		char server[256];

@@ -988,10 +987,6 @@ protected:
 			m_cbType.SetCurSel(ACC_LOL_US);

 			m_canregister = false;

 		}

-		else if (!mir_strcmp(server, "xmpp.odnoklassniki.ru")) {

-			m_cbType.SetCurSel(ACC_OK);

-			m_canregister = false;

-		}

 		else if (!mir_strcmp(server, "S.ms")) {

 			m_cbType.SetCurSel(ACC_SMS);

 			m_canregister = false;

@@ -1038,10 +1033,6 @@ protected:
 			m_proto->m_bUseSSL = m_proto->m_bUseTLS = false;

 			break;

 

-		case ACC_OK:

-			m_proto->m_bIgnoreRoster = true;

-			__fallthrough;

-

 		case ACC_TLS:

 		case ACC_HIPCHAT:

 		case ACC_LJTALK:

@@ -1172,7 +1163,6 @@ protected:
 		case ACC_LOL_EW: setupLOLEW(); break;

 		case ACC_LOL_OC: setupLOLOC(); break;

 		case ACC_LOL_US: setupLOLUS(); break;

-		case ACC_OK: setupOK(); break;

 		case ACC_SMS: setupSMS(); break;

 		}

 	}

@@ -1256,15 +1246,6 @@ protected:
 		setupHost(false, false);

 	}

 

-	void setupOK()

-	{

-		m_canregister = false;

-		m_txtServer.SetTextA("xmpp.odnoklassniki.ru");

-		m_chkManualHost.SetState(BST_UNCHECKED);

-		m_iDefPort = 5222;

-		setupHost(false, true);

-	}

-

 	void setupSMS()

 	{

 		m_canregister = false;