[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/oscar/icq
From:       Markus Meik Slopianka <markus.s () kdemail ! net>
Date:       2010-11-16 15:01:13
Message-ID: 20101116150113.D59BAAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197797 by markuss:

AOL sold ICQ. Change login.oscar.aol.com to login.icq.com
BUG:257008

 M  +1 -1      icqaccount.cpp  
 M  +3 -3      ui/icqeditaccountwidget.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/icqaccount.cpp #1197796:1197797
@@ -236,7 +236,7 @@
 		myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() );
 		QString icqNumber = accountId();
 		kDebug(14153) << "Logging in as " << icqNumber;
-		QString server = configGroup()->readEntry( "Server", QString::fromLatin1( \
"login.oscar.aol.com" ) ); +		QString server = configGroup()->readEntry( "Server", \
QString::fromLatin1( "login.icq.com" ) );  uint port = configGroup()->readEntry( \
"Port", 5190 );  
 		//set up the settings for the account
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp \
#1197796:1197797 @@ -80,9 +80,9 @@
 		mAccountSettings->mPasswordWidget->load(&mAccount->password());
 		mAccountSettings->chkAutoLogin->setChecked(mAccount->excludeConnect());
 
-		QString serverEntry = mAccount->configGroup()->readEntry("Server", \
"login.oscar.aol.com"); +		QString serverEntry = \
mAccount->configGroup()->readEntry("Server", "login.icq.com");  int portEntry = \
                mAccount->configGroup()->readEntry("Port", 5190);
-		mAccountSettings->optionOverrideServer->setChecked( serverEntry != \
"login.oscar.aol.com" || ( portEntry != 5190) ); \
+		mAccountSettings->optionOverrideServer->setChecked( serverEntry != "login.icq.com" \
|| ( portEntry != 5190) );  
 		mAccountSettings->edtServerAddress->setText( serverEntry );
 		mAccountSettings->edtServerPort->setValue( portEntry );
@@ -253,7 +253,7 @@
 	}
 	else
 	{
-		mAccount->setServerAddress("login.oscar.aol.com");
+		mAccount->setServerAddress("login.icq.com");
 		mAccount->setServerPort(5190);
 	}
 


[prev in list] [next in list] [prev in thread] [next in thread]