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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo
From:       Matt Rogers <mattr () kde ! org>
Date:       2010-01-12 3:55:27
Message-ID: 1263268527.515307.7085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073379 by mattr:

Yahoo Webcam and Avatar fixes.

You can now accept a webcam from a Yahoo user.
You can send your webcam.
User avatars are now downloaded and stored as long as you're online when
the change happens.

Patch from Michael Cole. Thanks!

CCMAIL: mcole@mycam-asia.tv

 M  +3 -0      client.cpp  
 M  +3 -1      picturenotifiertask.cpp  
 M  +1 -1      picturenotifiertask.h  
 M  +3 -2      webcamtask.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/client.cpp #1073378:1073379
@@ -88,6 +88,7 @@
 	YABTask *yabTask;
 	FileTransferNotifierTask *fileTransferTask;
 	YahooChatTask *yahooChatTask;
+	ReceiveFileTask *receiveFileTask;
 
 	// Connection data
 	uint sessionID;
@@ -960,6 +961,8 @@
 	d->fileTransferTask = 0;
 	d->yahooChatTask->deleteLater();
 	d->yahooChatTask = 0;
+	d->receiveFileTask->deleteLater();
+	d->receiveFileTask = 0;
 }
 
 #include "client.moc"
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp #1073378:1073379
@@ -49,9 +49,11 @@
 	{	
 		case Yahoo::ServicePictureStatus:
 			parsePictureStatus( t );
+			parsePicture( t );
 		break;
 		case Yahoo::ServicePictureChecksum:
 			parsePictureChecksum( t );
+			parsePicture( t );
 		break;
 		case Yahoo::ServicePicture:
 			parsePicture( t );
@@ -127,7 +129,7 @@
 	
 	if( type == 1 )
 		emit pictureRequest( nick );
-	else if( type == 2 )
+	else if( type == 0 )
 		emit pictureInfoNotify( nick, KUrl( url ), checksum );
 }
 
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h #1073378:1073379
@@ -44,7 +44,7 @@
 signals:
 	void pictureStatusNotify( const QString &, int );
 	void pictureChecksumNotify( const QString &, int );
-	void pictureInfoNotify( const QString &, KUrl, int ); 
+	void pictureInfoNotify( const QString &, KUrl, int );
 	void pictureRequest( const QString & );
 	void pictureUploaded( const QString &, int );
 };
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp #1073378:1073379
@@ -226,7 +226,7 @@
 	kDebug(YAHOO_RAW_DEBUG) ;
 	QByteArray data;
 	data.reserve( socket->bytesAvailable() );
-	socket->read ( data.data (), data.size () );
+	data = socket->readAll();
 	kDebug(YAHOO_RAW_DEBUG) << "Magic Byte:" << data[2];
 
 	socketMap[socket].status = ConnectedStage2;
@@ -277,7 +277,8 @@
 	QByteArray data;
 	data.reserve( socket->bytesAvailable() );
 	
-	socket->read( data.data (), data.size () );
+	data = socket->readAll();
+	
 	if( data.size() <= 0 )
 	{
 		kDebug(YAHOO_RAW_DEBUG) << "No data read.";
[prev in list] [next in list] [prev in thread] [next in thread]