[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/oscar/icq
From: Pali Rohár <pali.rohar () gmail ! com>
Date: 2013-05-21 16:45:33
Message-ID: 20130521164533.AD8A7AC85D () svn ! kde ! org
[Download RAW message or body]
SVN commit 1355870 by pali:
Enable SSL encryption for all new ICQ accounts, fix edit account strings and fix \
reading server and port options from Kopete config file
M +3 -3 icqaccount.cpp
M +11 -8 ui/icqeditaccountui.ui
M +3 -3 ui/icqeditaccountwidget.cpp
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/icqaccount.cpp #1355869:1355870
@@ -236,9 +236,9 @@
myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() );
QString icqNumber = accountId();
kDebug(14153) << "Logging in as " << icqNumber;
- bool encrypted = configGroup()->readEntry( "Encrypted", false );
- QString server = configGroup()->readEntry( "Server", QString::fromLatin1( \
encrypted ? "slogin.icq.com" : "login.icq.com" ) );
- uint port = configGroup()->readEntry( "Port", encrypted ? 443 : 5190 );
+ QString server = configGroup()->readEntry( "Server", "slogin.icq.com" );
+ uint port = configGroup()->readEntry( "Port", 443 );
+ bool encrypted = configGroup()->readEntry( "Encrypted", ( server == \
"slogin.icq.com" && port == 443 ) );
//set up the settings for the account
Oscar::Settings* oscarSettings = engine()->clientSettings();
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui \
#1355869:1355870 @@ -298,6 +298,9 @@
<property name="text">
<string>Use SSL encryption</string>
</property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -340,7 +343,7 @@
<string>The IP address or hostmask of the ICQ server you wish to \
connect to.</string> </property>
<property name="whatsThis">
- <string>The IP address or hostmask of the ICQ server you wish to \
connect to. Normally you will want the default (login.icq.com).</string> + \
<string>The IP address or hostmask of the ICQ server you wish to connect to. \
Normally you will want the default (slogin.icq.com or login.icq.com).</string> \
</property> <property name="text">
<string>Ser&ver /</string>
@@ -359,7 +362,7 @@
<string>The port on the ICQ server that you would like to connect \
to.</string> </property>
<property name="whatsThis">
- <string>The port on the ICQ server that you would like to connect to. \
Normally this is 5190.</string> + <string>The port on the ICQ server \
that you would like to connect to. Normally this is 443 or 5190.</string> \
</property> <property name="text">
<string>Po&rt:</string>
@@ -378,10 +381,10 @@
<string>The IP address or hostmask of the ICQ server you wish to \
connect to.</string> </property>
<property name="whatsThis">
- <string>The IP address or hostmask of the ICQ server you wish to \
connect to. Normally you will want the default (login.icq.com).</string> + \
<string>The IP address or hostmask of the ICQ server you wish to connect to. \
Normally you will want the default (slogin.icq.com or login.icq.com).</string> \
</property> <property name="text">
- <string>login.icq.com</string>
+ <string>slogin.icq.com</string>
</property>
</widget>
</item>
@@ -394,7 +397,7 @@
<string>The port on the ICQ server that you would like to connect \
to.</string> </property>
<property name="whatsThis">
- <string>The port on the ICQ server that you would like to connect to. \
Normally this is 5190.</string> + <string>The port on the ICQ server \
that you would like to connect to. Normally this is 443 or 5190.</string> \
</property> <property name="minimum">
<number>1</number>
@@ -403,7 +406,7 @@
<number>65534</number>
</property>
<property name="value">
- <number>5190</number>
+ <number>443</number>
</property>
</widget>
</item>
@@ -461,7 +464,7 @@
<string>The IP address or hostmask of the proxy server you wish to \
use for connecting to an ICQ server.</string> </property>
<property name="whatsThis">
- <string>The IP address or hostmask of the proxy server you wish to \
use for connecting to an ICQ server. The proxy server must support a CONNECT command \
and allow connections to the ICQ server port (normally 5190).</string> + \
<string>The IP address or hostmask of the proxy server you wish to use for connecting \
to an ICQ server. The proxy server must support a CONNECT command and allow \
connections to the ICQ server port (normally 443 or 5190).</string> </property>
<property name="text">
<string>Ser&ver /</string>
@@ -499,7 +502,7 @@
<string>The IP address or hostmask of the proxy server you wish to \
use for connecting to an ICQ server.</string> </property>
<property name="whatsThis">
- <string>The IP address or hostmask of the proxy server you wish to \
use for connecting to an ICQ server. The proxy server must support a CONNECT command \
and allow connections to the ICQ server port (normally 5190).</string> + \
<string>The IP address or hostmask of the proxy server you wish to use for connecting \
to an ICQ server. The proxy server must support a CONNECT command and allow \
connections to the ICQ server port (normally 443 or 5190).</string> </property>
<property name="text">
<string/>
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp \
#1355869:1355870 @@ -80,9 +80,9 @@
mAccountSettings->mPasswordWidget->load(&mAccount->password());
mAccountSettings->chkAutoLogin->setChecked(mAccount->excludeConnect());
- bool encryptedEntry = mAccount->configGroup()->readEntry("Encrypted", false);
- QString serverEntry = mAccount->configGroup()->readEntry("Server", encryptedEntry \
? "slogin.icq.com" : "login.icq.com");
- int portEntry = mAccount->configGroup()->readEntry("Port", encryptedEntry ? 443 : \
5190); + QString serverEntry = mAccount->configGroup()->readEntry("Server", \
"slogin.icq.com"); + int portEntry = mAccount->configGroup()->readEntry("Port", \
443); + bool encryptedEntry = mAccount->configGroup()->readEntry("Encrypted", ( \
serverEntry == "slogin.icq.com" && portEntry == 443 )); if ( ( encryptedEntry && ( \
serverEntry != "slogin.icq.com" || portEntry != 443 ) ) ||
( ! encryptedEntry && ( serverEntry != "login.icq.com" || ( portEntry != 5190 ) \
) ) ) mAccountSettings->optionOverrideServer->setChecked( true );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic