rev 4949 - in trunk/packages/kdenetwork/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2006-11-21 07:13:55 +0100 (Tue, 21 Nov 2006)
New Revision: 4949

Added:
   trunk/packages/kdenetwork/debian/patches/19_kopete_oftc_irc_fix.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff
Log:
fixes oftc
updates icq fix


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2006-11-21 02:02:40 UTC (rev 4948)
+++ trunk/packages/kdenetwork/debian/changelog	2006-11-21 06:13:55 UTC (rev 4949)
@@ -1,3 +1,12 @@
+kdenetwork (4:3.5.5-3) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela
+
+  * Fix servers for oftc irc. it is oftc.net, not oftc org.
+  * Updated icq patch from upstream svn
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Nov 2006 07:12:56 +0100
+
 kdenetwork (4:3.5.5-2) unstable; urgency=medium
 
   * Add a kwifimanager manpage, thanks to Chris Bier. (Closes: #392878)

Modified: trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff	2006-11-21 02:02:40 UTC (rev 4948)
+++ trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff	2006-11-21 06:13:55 UTC (rev 4949)
@@ -1,11 +1,27 @@
-diff -Nur kdenetwork-3.5.5/kopete/protocols/oscar/liboscar/client.cpp kdenetwork-3.5.5.new/kopete/protocols/oscar/liboscar/client.cpp
---- kdenetwork-3.5.5/kopete/protocols/oscar/liboscar/client.cpp	2006-10-01 19:26:52.000000000 +0200
-+++ kdenetwork-3.5.5.new/kopete/protocols/oscar/liboscar/client.cpp	2006-11-01 14:59:30.000000000 +0100
-@@ -340,6 +340,7 @@
- 		//we've finished logging in. start the services setup
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl;
- 		initializeStaticTasks();
-+		d->ownStatusTask->go();
- 		ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() );
- 		connect( ssTask, SIGNAL( finished() ), this, SLOT( serviceSetupFinished() ) );
- 		ssTask->go( true ); //fire and forget
+--- kdenetwork/kopete/protocols/oscar/liboscar/client.cpp	2006/10/31 18:48:12	600778
++++ kdenetwork/kopete/protocols/oscar/liboscar/client.cpp	2006/11/01 15:13:23	600976
+@@ -398,9 +397,12 @@
+ 	d->active = true;
+ 
+ 	if ( isIcq() )
+-	{
+ 		setStatus( d->connectAsStatus, d->connectWithMessage );
+ 
++	d->ownStatusTask->go();
++
++	if ( isIcq() )
++	{
+ 		//retrieve offline messages
+ 		Connection* c = d->connections.connectionForFamily( 0x0015 );
+ 		if ( !c )
+--- kdenetwork/kopete/protocols/oscar/oscaraccount.cpp	2006/08/17 13:37:13	573903
++++ kdenetwork/kopete/protocols/oscar/oscaraccount.cpp	2006/11/01 15:13:23	600976
+@@ -560,7 +560,7 @@
+ 	/* We're not even online or connecting
+ 	 * (when getting server contacts), so don't bother
+ 	 */
+-	if ( !myself()->isOnline() )
++	if ( !engine()->isActive() )
+ 	{
+ 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Can't add contact, we are offline!" << endl;
+ 		return false;

Added: trunk/packages/kdenetwork/debian/patches/19_kopete_oftc_irc_fix.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/19_kopete_oftc_irc_fix.diff	2006-11-21 02:02:40 UTC (rev 4948)
+++ trunk/packages/kdenetwork/debian/patches/19_kopete_oftc_irc_fix.diff	2006-11-21 06:13:55 UTC (rev 4949)
@@ -0,0 +1,17 @@
+--- kopete/protocols/irc/ircnetworks.xml.orig	2006-11-19 12:40:30.000000000 +0100
++++ kopete/protocols/irc/ircnetworks.xml	2006-11-19 12:41:05.000000000 +0100
+@@ -771,12 +771,12 @@
+         <description>The Open and Free Technology Community</description>
+         <servers>
+             <server>
+-                <host>irc.oftc.org</host>
++                <host>irc.oftc.net</host>
+                 <port>6667</port>
+                 <useSSL>false</useSSL>
+             </server>
+             <server>
+-                <host>ircs.oftc.org</host>
++                <host>ircs.oftc.net</host>
+                 <port>9999</port>
+                 <useSSL>true</useSSL>
+             </server>