From c2f60849cd6f5c2c66f7a306e031aa56d85760ab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 10 Jun 2022 20:13:49 +0300 Subject: fixes #3072 (GoogleTalk removed from templates) --- protocols/JabberG/src/jabber_opt.cpp | 39 ++---------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index bdc39f9060..08b4d31241 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -909,7 +909,7 @@ public: } protected: - enum { ACC_PUBLIC, ACC_TLS, ACC_SSL, ACC_GTALK, 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_OK, ACC_SMS }; bool OnInitDialog() override { @@ -943,7 +943,6 @@ protected: m_cbType.AddString(TranslateT("Public XMPP Network"), ACC_PUBLIC); m_cbType.AddString(TranslateT("Secure XMPP Network"), ACC_TLS); m_cbType.AddString(TranslateT("Secure XMPP Network (old style)"), ACC_SSL); - m_cbType.AddString(TranslateT("Google Talk!"), ACC_GTALK); m_cbType.AddString(TranslateT("Hipchat"), ACC_HIPCHAT); m_cbType.AddString(TranslateT("LiveJournal Talk"), ACC_LJTALK); m_cbType.AddString(TranslateT("League Of Legends (EU Nordic)"), ACC_LOL_EN); @@ -960,11 +959,7 @@ protected: mir_strncpy(manualServer, dbManualServer, _countof(manualServer)); m_canregister = true; - if (!mir_strcmp(manualServer, "talk.google.com")) { - m_cbType.SetCurSel(ACC_GTALK); - m_canregister = false; - } - else if (!mir_strcmp(server, "chat.hipchat.com")) { + if (!mir_strcmp(server, "chat.hipchat.com")) { m_cbType.SetCurSel(ACC_HIPCHAT); m_canregister = false; } @@ -1070,21 +1065,6 @@ protected: m_proto->m_bUseSSL = m_proto->m_bUseTLS = false; break; - case ACC_GTALK: - m_proto->setDword("Priority", 24); - { - int port = m_txtPort.GetInt(); - if (port == 443 || port == 5223) { - m_proto->m_bUseSSL = true; - m_proto->m_bUseTLS = false; - } - else if (port == 5222) { - m_proto->m_bUseSSL = false; - m_proto->m_bUseTLS = true; - } - } - break; - case ACC_OK: m_proto->m_bIgnoreRoster = true; m_proto->m_bUseSSL = false; @@ -1247,7 +1227,6 @@ private: case ACC_PUBLIC: setupPublic(); break; case ACC_TLS: setupSecure(); break; case ACC_SSL: setupSecureSSL(); break; - case ACC_GTALK: setupGoogle(); break; case ACC_HIPCHAT: setupHipchat(); break; case ACC_LJTALK: setupLJ(); break; case ACC_LOL_EN: setupLOLEN(); break; @@ -1301,20 +1280,6 @@ private: m_btnRegister.Enable(); } - void setupGoogle() - { - m_canregister = false; - m_txtServer.SetTextA("gmail.com"); - m_chkManualHost.SetState(BST_CHECKED); - m_txtManualHost.SetTextA("talk.google.com"); - m_txtPort.SetInt(443); - - m_txtServer.Enable(); - m_chkManualHost.Disable(); - m_txtManualHost.Disable(); - m_btnRegister.Disable(); - } - void setupHipchat() { m_canregister = false; -- cgit v1.2.3