From f7402a5fd3c86c1844cb0fcc14a33e0724b118d4 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sun, 17 Jun 2012 16:36:54 +0000
Subject: cosmetic settings fix added vk.com preset

git-svn-id: http://svn.miranda-ng.org/main/trunk@465 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/jabber.rc      | 20 --------------------
 protocols/JabberG/jabber_opt.cpp | 30 +++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'protocols')

diff --git a/protocols/JabberG/jabber.rc b/protocols/JabberG/jabber.rc
index ab8d804549..a2daa20277 100644
--- a/protocols/JabberG/jabber.rc
+++ b/protocols/JabberG/jabber.rc
@@ -809,18 +809,6 @@ BEGIN
         RIGHTMARGIN, 184
     END
 
-    IDD_OPT_JABBER3, DIALOG
-    BEGIN
-    END
-
-    IDD_OPT_JABBER, DIALOG
-    BEGIN
-    END
-
-    IDD_OPT_JABBER2, DIALOG
-    BEGIN
-    END
-
     IDD_OPT_REGISTER, DIALOG
     BEGIN
         RIGHTMARGIN, 165
@@ -840,14 +828,6 @@ BEGIN
         BOTTOMMARGIN, 137
     END
 
-    IDD_OPT_JABBER4, DIALOG
-    BEGIN
-    END
-
-    IDD_GROUPCHAT_ADMLIST, DIALOG
-    BEGIN
-    END
-
     IDD_NOTEBOOK, DIALOG
     BEGIN
         VERTGUIDE, 292
diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/jabber_opt.cpp
index 46665e7a63..230fdb8a5f 100644
--- a/protocols/JabberG/jabber_opt.cpp
+++ b/protocols/JabberG/jabber_opt.cpp
@@ -1692,7 +1692,7 @@ public:
 	}
 
 protected:
-	enum { ACC_PUBLIC, ACC_TLS, ACC_SSL, ACC_GTALK, ACC_LJTALK, ACC_FBOOK, ACC_SMS };
+	enum { ACC_PUBLIC, ACC_TLS, ACC_SSL, ACC_GTALK, ACC_LJTALK, ACC_FBOOK, ACC_VK, ACC_SMS };
 
 	void OnInitDialog()
 	{
@@ -1742,6 +1742,7 @@ protected:
 		m_cbType.AddString(TranslateT("Google Talk!"), ACC_GTALK);
 		m_cbType.AddString(TranslateT("LiveJournal Talk"), ACC_LJTALK);
 		m_cbType.AddString(TranslateT("Facebook Chat"), ACC_FBOOK);
+		m_cbType.AddString(TranslateT("Vkontakte"), ACC_VK);
 		m_cbType.AddString(TranslateT("S.ms"), ACC_SMS);
 
 		m_cbServer.GetTextA(server, SIZEOF(server));
@@ -1767,6 +1768,11 @@ protected:
 			m_cbType.SetCurSel(ACC_FBOOK);
 			m_canregister = false;
 		}
+		else if (!lstrcmpA(server, "vk.com"))
+		{
+			m_cbType.SetCurSel(ACC_VK);
+			m_canregister = false;
+		}
 		else if (!lstrcmpA(server, "S.ms"))
 		{
 			m_cbType.SetCurSel(ACC_SMS);
@@ -1856,6 +1862,7 @@ protected:
 		case ACC_FBOOK:
 			m_proto->m_options.IgnoreRosterGroups = TRUE;
 
+		case ACC_VK:
 		case ACC_PUBLIC:
 			m_proto->m_options.UseSSL = m_proto->m_options.UseTLS = FALSE;
 			break;
@@ -2036,6 +2043,7 @@ private:
 	void setupGoogle();
 	void setupLJ();
 	void setupFB();
+	void setupVK();
 	void setupSMS();
 	void RefreshServers( HXML node);
 	static void QueryServerListThread(void *arg);
@@ -2074,6 +2082,7 @@ void CJabberDlgAccMgrUI::setupConnection(int type)
 		case ACC_GTALK: setupGoogle(); break;
 		case ACC_LJTALK: setupLJ(); break;
 		case ACC_FBOOK: setupFB(); break;
+		case ACC_VK: setupVK(); break;
 		case ACC_SMS: setupSMS(); break;
 	}
 }
@@ -2179,6 +2188,25 @@ void CJabberDlgAccMgrUI::setupFB()
 //	m_cbResource.Disable();
 }
 
+void CJabberDlgAccMgrUI::setupVK()
+{
+	m_canregister = false;
+	m_gotservers = true;
+	m_cbServer.ResetContent();
+	m_cbServer.SetTextA("VK.com");
+	m_cbServer.AddStringA("VK.com");
+	m_chkManualHost.SetState(BST_UNCHECKED);
+	m_txtManualHost.SetTextA("");
+	m_txtPort.SetInt(5222);
+
+	m_cbServer.Disable();
+	m_chkManualHost.Disable();
+	m_txtManualHost.Disable();
+	m_txtPort.Disable();
+	m_btnRegister.Disable();
+//	m_cbResource.Disable();
+}
+
 void CJabberDlgAccMgrUI::setupSMS()
 {
 	m_canregister = false;
-- 
cgit v1.2.3