File 4_1_BRANCH.diff of Package kdenetwork4

package: kdenetwork-4.1.3.tar.bz2
kdemod: kdenetwork
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 878038
+svn di between //tags/KDE/4.1.3/kdenetwork and //branches/KDE/4.1/kdenetwork
--- kopete/protocols/oscar/liboscar/userdetails.cpp	
+++ kopete/protocols/oscar/liboscar/userdetails.cpp	
@@ -277,8 +277,8 @@
 				break;
 			case 0x0004: //idle time
 				m_idleTime = b.getWord() * 60;
-#ifdef OSCAR_USERINFO_DEBUG
 				m_idleTimeSpecified = true;
+#ifdef OSCAR_USERINFO_DEBUG
 				kDebug(OSCAR_RAW_DEBUG) << "Idle time is " << m_idleTime;
 #endif
 				break;
--- kopete/protocols/msn/msnnotifysocket.cpp	
+++ kopete/protocols/msn/msnnotifysocket.cpp	
@@ -225,6 +225,8 @@
 		emit errorMessage( MSNSocket::ErrorSorry, msg );
 		break;
 	}
+	case 712: //"session is overloaded". This is just a useless error that only annoys the users. ignore it.
+		break;
 	case 715:
 	{
 		/*

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
   +