From kde-commits  Tue Oct 31 23:31:57 2006
From: Roman Jarosz <kedgedev () centrum ! cz>
Date: Tue, 31 Oct 2006 23:31:57 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/oscar/liboscar
Message-Id: <1162337517.550447.31928.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116233755920606

SVN commit 600837 by rjarosz:

Merge OSCAR from 3.5 branch up to revision 600813.



 M  +1 -0      client.cpp  
 M  +1 -4      offlinemessagestask.cpp  
 M  +0 -1      offlinemessagestask.h  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/client.cpp #600836:600837
@@ -345,6 +345,7 @@
 		//we've finished logging in. start the services setup
 		kDebug(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
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp #600836:600837
@@ -30,7 +30,6 @@
  : ICQTask( parent )
 {
 	tzset();
-	m_msgCount = 0;
 	m_sequence = 0;
 }
 
@@ -125,7 +124,6 @@
 void OfflineMessagesTask::handleOfflineMessage()
 {
 	Oscar::Message message = parseOfflineMessage(transfer()->buffer());
-	m_msgCount++;
 	emit receivedOfflineMessage( message );
 }
 
@@ -139,8 +137,7 @@
 	buffer->skipBytes( 8 );
 	m_sequence = buffer->getLEWord();
 	
-	if ( m_msgCount > 0 )
-		deleteOfflineMessages();
+	deleteOfflineMessages();
 	
 	setSuccess( true );
 }
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/offlinemessagestask.h #600836:600837
@@ -50,7 +50,6 @@
 	void deleteOfflineMessages();
 	
 private:
-	int m_msgCount;
 	int m_sequence;
 };