LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File bnc653852-kopete-icq-server-change.diff of Package kdenetwork3 (Project openSUSE:Factory)

--- kopete/kopete/kconf_update/Makefile.am.orig	2010-11-17 13:56:32.000000000 +0100
+++ kopete/kopete/kconf_update/Makefile.am	2010-11-17 13:57:45.000000000 +0100
@@ -2,9 +2,11 @@
 
 update_DATA = kopete-pluginloader.upd kopete-account-kconf_update.upd \
 	kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd \
+	kopete-update_icq_server.upd \
 	kopete-jabberpriorityaddition-kconf_update.upd kopete-nameTracking.upd
 update_SCRIPTS = kopete-pluginloader.pl kopete-account-kconf_update.sh \
 	kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh \
+	kopete-update_icq_server.pl \
 	kopete-jabberpriorityaddition-kconf_update.sh kopete-account-0.10.pl
 updatedir = $(kde_datadir)/kconf_update
 
--- ./kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp.orig	2008-02-13 10:37:43.000000000 +0100
+++ ./kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp	2010-11-17 13:43:31.000000000 +0100
@@ -67,9 +67,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()->readNumEntry("Port", 5190);
-		if ( serverEntry != "login.oscar.aol.com" || ( portEntry != 5190) )
+		if ( serverEntry != "login.icq.com" || ( portEntry != 5190) )
 			mAccountSettings->optionOverrideServer->setChecked( true );
 
 		mAccountSettings->edtServerAddress->setText( serverEntry );
@@ -144,7 +144,7 @@
 	}
 	else
 	{
-		mAccount->setServerAddress("login.oscar.aol.com");
+		mAccount->setServerAddress("login.icq.com");
 		mAccount->setServerPort(5190);
 	}
 	
--- ./kopete/kopete/kconf_update/kopete-update_icq_server.pl.orig	2010-11-17 13:51:00.000000000 +0100
+++ ./kopete/kopete/kconf_update/kopete-update_icq_server.pl	2010-11-17 13:54:09.000000000 +0100
@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+
+# AOL sold ICQ; change the default server to login.icq.com
+
+my $inICQ = 0;
+foreach (<>) {
+    $inICQ = 1 if (/^\[Account_ICQProtocol_.*$/);
+    if ($inICQ) {
+        if (/^Server\=(.*)/) {
+            my $oldServer = $1;
+            if ($oldServer =~ m/\.aol\.com$/) {
+                print "Server=login.icq.com\n";
+                $inICQ = 0;
+                next;
+            }
+        }
+    }
+
+    print $_;
+}
--- ./kopete/kopete/kconf_update/kopete-update_icq_server.upd.orig	2010-11-17 13:51:00.000000000 +0100
+++ ./kopete/kopete/kconf_update/kopete-update_icq_server.upd	2010-11-17 13:54:09.000000000 +0100
@@ -0,0 +1,4 @@
+Id=kopete-update-icq-server/r1
+File=kopeterc
+Options=overwrite
+Script=kopete-update_icq_server.pl,perl