One nore fix for OK, VK leftovers cleaned

git-svn-id: http://svn.miranda-ng.org/main/trunk@10399 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 22 deletions

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 3540b821c2..a1bd10f547 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -1677,7 +1677,7 @@ protected:
 			m_cbType.SetCurSel(ACC_FBOOK);

 			m_canregister = false;

 		}

-		else if (!lstrcmpA(manualServer, "xmpp.odnoklassniki.ru")) {

+		else if (!lstrcmpA(server, "xmpp.odnoklassniki.ru")) {

 			m_cbType.SetCurSel(ACC_OK);

 			m_canregister = false;

 		}

@@ -2079,13 +2079,13 @@ void CJabberDlgAccMgrUI::setupFB()
 	m_btnRegister.Disable();

 }

 

-void CJabberDlgAccMgrUI::setupVK()

+void CJabberDlgAccMgrUI::setupOK()

 {

 	m_canregister = false;

 	m_gotservers = true;

 	m_cbServer.ResetContent();

-	m_cbServer.SetTextA("VK.com");

-	m_cbServer.AddStringA("VK.com");

+	m_cbServer.SetTextA("xmpp.odnoklassniki.ru");

+	m_cbServer.AddStringA("xmpp.odnoklassniki.ru");

 	m_chkManualHost.SetState(BST_UNCHECKED);

 	m_txtManualHost.SetTextA("");

 	m_txtPort.SetInt(5222);

@@ -2097,24 +2097,6 @@ void CJabberDlgAccMgrUI::setupVK()
 	m_btnRegister.Disable();

 }

 

-void CJabberDlgAccMgrUI::setupOK()

-{

-	m_canregister = false;

-	m_gotservers = true;

-	m_cbServer.ResetContent();

-	m_cbServer.SetTextA("odnoklassniki.ru");

-	m_cbServer.AddStringA("odnoklassniki.ru");

-	m_chkManualHost.SetState(BST_CHECKED);

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

-	m_txtPort.SetInt(5222);

-

-	m_cbServer.Disable();

-	m_chkManualHost.Disable();

-	m_txtManualHost.Disable();

-	m_txtPort.Disable();

-	m_btnRegister.Disable();

-}

-

 void CJabberDlgAccMgrUI::setupSMS()

 {

 	m_canregister = false;