Many fixes to the Yahoo protocol, courtesy of Serghei Amelian

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1146108 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 746 insertions, 432 deletions

diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 6aa7f880..3a64d215 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -3,7 +3,8 @@
 
     Copyright (c) 2003 by Gav Wood               <gav@kde.org>
     Copyright (c) 2003-2004 by Matt Rogers       <matt.rogers@kdemail.net>
-    Based on code by Olivier Goffart             <ogoffart @ kde.org>
+    Based on code by Olivier Goffart             <ogoffart@kde.org>
+
     Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 
     *************************************************************************
@@ -26,6 +27,7 @@
 #include <qregexp.h>
 #include <qimage.h>
 #include <qfile.h>
+#include <qpixmap.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 
@@ -36,10 +38,7 @@
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
 #include <krun.h>
-#include <kurl.h>
-#include <kstandarddirs.h>
 #include <kstandarddirs.h>
 
 // Kopete
@@ -67,19 +66,6 @@
 #include "yabentry.h"
 #include "yahoouserinfodialog.h"
 
-YahooAwayDialog::YahooAwayDialog(YahooAccount* account, QWidget *parent, const char *name) :
-	KopeteAwayDialog(parent, name)
-{
-	theAccount = account;
-}
-
-void YahooAwayDialog::setAway(int awayType)
-{
-	awayType = 0;
-	theAccount->setAway(awayType, getSelectedAwayMessage());
-}
-
-
 YahooAccount::YahooAccount(YahooProtocol *parent, const QString& accountId, const char *name)
  : Kopete::PasswordedAccount(parent, accountId, 0, name)
 {
@@ -87,58 +73,74 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const QString& accountId, cons
 	// first things first - initialise internals
 	stateOnConnection = 0;
 	theHaveContactList = false;
-	theAwayDialog = new YahooAwayDialog( this );
 	m_protocol = parent;
 	m_session = new Client( this );
 	m_lastDisconnectCode = 0;
 	m_currentMailCount = 0;
-	m_webcam = 0L;
-	
-	m_session->setUserId( accountId.lower() );
-	
+	m_webcam = 0;
+	m_chatChatSession = 0;
+
+	// FIXME
+	//m_openInboxAction = new KAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
+        //, "m_openInboxAction" );
+	//QObject::connect(m_openInboxAction, SIGNAL( triggered(bool) ), this, SLOT( slotOpenInbox() ) );
+	//m_openYABAction = new KAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
+        //, "m_openYABAction" );
+	//QObject::connect(m_openYABAction, SIGNAL( triggered(bool) ), this, SLOT( slotOpenYAB() ) );
+	//m_editOwnYABEntry = new KAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this );
+        //, "m_editOwnYABEntry" );
+	//QObject::connect(m_editOwnYABEntry, SIGNAL( triggered(bool) ), this, SLOT( slotEditOwnYABEntry() ) );
+	//m_joinChatAction = new KAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
+        //, "m_joinChatAction" );
+	//QObject::connect(m_joinChatAction, SIGNAL( triggered(bool) ), this, SLOT( slotJoinChatRoom() ) );
+
 	m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
 	m_openYABAction = new KAction( i18n( "Open &Addressbook..." ), "contents", 0, this, SLOT( slotOpenYAB() ), this, "m_openYABAction" );
 	m_editOwnYABEntry = new KAction( i18n( "&Edit my contact details..."), "contents", 0, this, SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" );
+	m_joinChatAction = new KAction( i18n( "&Join chat room..."), "contents", 0, this, SLOT( slotJoinChatRoom() ), this, "m_joinChatAction");
 
 	YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() );
 	setMyself( _myself );
 	_myself->setOnlineStatus( parent->Offline );
 	myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, configGroup()->readEntry( "iconRemoteUrl", "" ) );
 	myself()->setProperty( Kopete::Global::Properties::self()->photo(), configGroup()->readEntry( "iconLocalUrl", "" ) );
-	myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readNumEntry( "iconCheckSum", 0 ) );
-	myself()->setProperty( YahooProtocol::protocol()->iconExpire, configGroup()->readNumEntry( "iconExpire", 0 ) );
-	
-	QObject::connect( Kopete::ContactList::self(), SIGNAL( globalIdentityChanged(const QString&, const QVariant& ) ), SLOT( slotGlobalIdentityChanged(const QString&, const QVariant& ) ));
+	myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readEntry( "iconCheckSum", 0 ) );
+	myself()->setProperty( YahooProtocol::protocol()->iconExpire, configGroup()->readEntry( "iconExpire", 0 ) );
+
 // 	initConnectionSignals( MakeConnections );
-	
-	QString displayName = configGroup()->readEntry(QString::fromLatin1("displayName"));
+
+	QString displayName = configGroup()->readEntry(QString::fromLatin1("displayName"), QString());
 	if(!displayName.isEmpty())
 		_myself->setNickName(displayName);
-	
+
 	m_YABLastMerge = configGroup()->readNumEntry( "YABLastMerge", 0 );
 	m_YABLastRemoteRevision = configGroup()->readNumEntry( "YABLastRemoteRevision", 0 );
+
+	m_session->setUserId( accountId.lower() );
+	m_session->setPictureChecksum( myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() );
+
+	setupActions( false );
 }
 
 YahooAccount::~YahooAccount()
 {
 	if( m_webcam )
 		m_webcam->stopTransmission();
-	delete theAwayDialog;
 }
 
 void YahooAccount::setServer( const QString &server )
 {
-	configGroup()->writeEntry( QString::fromLatin1( "Server" ), server );	
+	configGroup()->writeEntry( QString::fromLatin1( "Server" ), server );
 }
 
 void YahooAccount::setPort( int port )
 {
-	configGroup()->writeEntry( QString::fromLatin1( "Port" ), port );	
+	configGroup()->writeEntry( QString::fromLatin1( "Port" ), port );
 }
 
 void YahooAccount::slotGoStatus( int status, const QString &awayMessage)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "GoStatus: " << status << " msg: " << awayMessage <<endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl;
 	if( !isConnected() )
 	{
 		connect( m_protocol->statusFromYahoo( status ) );
@@ -146,12 +148,11 @@ void YahooAccount::slotGoStatus( int status, const QString &awayMessage)
 	}
 	else
 	{
-		m_session->changeStatus( Yahoo::Status( status ), awayMessage, 
+		m_session->changeStatus( Yahoo::Status( status ), awayMessage,
 			(status == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
-		
+
 		//sets the awayMessage property for the owner of the account. shows up in the statusbar icon's tooltip. the property is unset when awayMessage is null
 		myself()->setProperty( m_protocol->awayMessage, awayMessage );
-
 		myself()->setOnlineStatus( m_protocol->statusFromYahoo( status ) );
 	}
 }
@@ -164,7 +165,7 @@ Client *YahooAccount::yahooSession()
 QString YahooAccount::stripMsgColorCodes(const QString& msg)
 {
 	QString filteredMsg = msg;
-	
+
 	//Handle bold, underline and italic messages
 	filteredMsg.replace( "\033[1m", "<b>" );
 	filteredMsg.replace( "\033[x1m", "</b>" );
@@ -172,18 +173,18 @@ QString YahooAccount::stripMsgColorCodes(const QString& msg)
 	filteredMsg.replace( "\033[x2m", "</i>" );
 	filteredMsg.replace( "\033[4m", "<u>" );
 	filteredMsg.replace( "\033[x4m", "</u>" );
-	
+
 	//GAIM doesn't check for ^[[3m. Does this ever get sent?
 	filteredMsg.replace( "\033[3m", "<i>" );
 	filteredMsg.replace( "\033[x3m", "</i>" );
-	
+
 	//Strip link tags
 	filteredMsg.remove( "\033[lm" );
 	filteredMsg.remove( "\033[xlm" );
-	
+
 	//Remove color codes and other residual formatting
 	filteredMsg.remove( QRegExp("\033\\[[^m]*m") );
-	
+
 	return filteredMsg;
 }
 
@@ -192,7 +193,7 @@ QColor YahooAccount::getMsgColor(const QString& msg)
 	/* Yahoo sends a message either with color or without color
 	 * so we have to use this really hacky method to get colors
 	 */
-	//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "msg is " << msg << endl;
+	//kdDebug(YAHOO_GEN_DEBUG) << "msg is " << msg;
 	//Please note that some of the colors are hard-coded to
 	//match the yahoo colors
 	if ( msg.find("\033[38m") != -1 )
@@ -230,37 +231,46 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
 	{
 		QObject::connect(m_session, SIGNAL(loggedIn( int, const QString &)),
 		                 this, SLOT(slotLoginResponse(int, const QString &)) );
-		
+
 		QObject::connect(m_session, SIGNAL(disconnected()),
 		                 this, SLOT(slotDisconnected()) );
-		
+
 		QObject::connect(m_session, SIGNAL(loginFailed()),
 		                 this, SLOT(slotLoginFailed()) );
-		
+
 		QObject::connect(m_session, SIGNAL(error(int)),
 		                 this, SLOT(slotError(int)));
-		
+
 		QObject::connect(m_session, SIGNAL(gotBuddy(const QString &, const QString &, const QString &)),
 		                 this, SLOT(slotGotBuddy(const QString &, const QString &, const QString &)));
-		
+
+		QObject::connect(m_session, SIGNAL(buddyAddResult(const QString &, const QString &, bool)),
+				 this, SLOT(slotBuddyAddResult(const QString &, const QString &, bool)));
+
+		QObject::connect(m_session, SIGNAL(buddyRemoveResult(const QString &, const QString &, bool)),
+				 this, SLOT(slotBuddyRemoveResult(const QString &, const QString &, bool)));
+
+		QObject::connect(m_session, SIGNAL(buddyChangeGroupResult(const QString &, const QString &, bool)),
+				 this, SLOT(slotBuddyChangeGroupResult(const QString &, const QString &, bool)));
+
 		QObject::connect(m_session, SIGNAL(authorizationAccepted( const QString & )),
 		                 this, SLOT(slotAuthorizationAccepted( const QString & )) );
-		
+
 		QObject::connect(m_session, SIGNAL(authorizationRejected( const QString &, const QString & )),
 		                 this, SLOT(slotAuthorizationRejected( const QString &, const QString & )) );
-		
+
 		QObject::connect(m_session, SIGNAL(gotAuthorizationRequest( const QString &, const QString &, const QString & )),
 		                 this, SLOT(slotgotAuthorizationRequest( const QString &, const QString &, const QString & )) );
-		
-		QObject::connect(m_session, SIGNAL(statusChanged(const QString&, int, const QString&, int, int)),
-		                 this, SLOT(slotStatusChanged(const QString&, int, const QString&, int, int)));
-		
-		QObject::connect(m_session, SIGNAL(stealthStatusChanged(const QString &, Yahoo::StealthStatus)), 
+
+		QObject::connect(m_session, SIGNAL(statusChanged(const QString&,int,const QString&,int,int,int)),
+		                 this, SLOT(slotStatusChanged(const QString&,int,const QString&,int,int,int)));
+
+		QObject::connect(m_session, SIGNAL(stealthStatusChanged(const QString &, Yahoo::StealthStatus)),
 		                 this, SLOT(slotStealthStatusChanged( const QString &, Yahoo::StealthStatus)) );
-		
+
 		QObject::connect(m_session, SIGNAL(gotIm(const QString&, const QString&, long, int)),
 		                 this, SLOT(slotGotIm(const QString &, const QString&, long, int)));
-		
+
 		QObject::connect(m_session, SIGNAL(gotBuzz(const QString&, long)),
 		                 this, SLOT(slotGotBuzz(const QString &, long)));
 
@@ -269,233 +279,258 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
 		                 this,
 		                 SLOT( slotGotConfInvite( const QString&, const QString&,
 		                                          const QString&, const QStringList& ) ) );
-		
+
 		QObject::connect(m_session, SIGNAL(confUserDeclined(const QString&, const QString &, const QString &)),
 		                 this,
 		                 SLOT(slotConfUserDecline( const QString &, const QString &, const QString &)) );
-		
+
 		QObject::connect(m_session , SIGNAL(confUserJoined( const QString &, const QString &)), this,
 		                 SLOT(slotConfUserJoin( const QString &, const QString &)) );
-		
+
 		QObject::connect(m_session , SIGNAL(confUserLeft( const QString &, const QString &)), this,
 		                 SLOT(slotConfUserLeave( const QString &, const QString &)) );
-		
+
 		QObject::connect(m_session , SIGNAL(gotConferenceMessage( const QString &, const QString &, const QString &)), this,
 		                 SLOT(slotConfMessage( const QString &, const QString &, const QString &)) );
-		
+
 		QObject::connect(m_session,
-		                 SIGNAL(incomingFileTransfer(const QString &, const QString &, long, const QString &, const QString &, unsigned long)),
+		                 SIGNAL(incomingFileTransfer(const QString &, const QString &, long, const QString &, const QString &, unsigned long, const QPixmap &)),
 		                 this,
-		                 SLOT(slotGotFile(const QString&, const QString&, long, const QString&, const QString&, unsigned long)));
-		
+		                 SLOT(slotGotFile(const QString&, const QString&, long, const QString&, const QString&, unsigned long, const QPixmap &)));
+
 		QObject::connect(m_session, SIGNAL(fileTransferComplete(unsigned int)), this,
 		                 SLOT(slotFileTransferComplete(unsigned int)) );
-		
+
 		QObject::connect(m_session, SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this,
 		                 SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) );
-		
+
 		QObject::connect(m_session, SIGNAL(fileTransferError(unsigned int,int,const QString &)), this,
 		                 SLOT(slotFileTransferError(unsigned int,int,const QString &)) );
-		
+
 		QObject::connect(m_session, SIGNAL(typingNotify(const QString &, int)), this ,
 		                 SLOT(slotTypingNotify(const QString &, int)));
-		
+
 // 		QObject::connect(m_session, SIGNAL(gameNotify(const QString &, int)), this,
 // 		                 SLOT(slotGameNotify( const QString &, int)));
-		
+
 		QObject::connect(m_session, SIGNAL(mailNotify(const QString&, const QString&, int)), this,
 		                 SLOT(slotMailNotify(const QString &, const QString&, int)));
-		
+
 		QObject::connect(m_session, SIGNAL(systemMessage(const QString&)), this,
 		                 SLOT(slotSystemMessage(const QString &)));
-		
+
 // 		QObject::connect(m_session, SIGNAL(gotIdentities(const QStringList &)), this,
 // 		                 SLOT(slotGotIdentities( const QStringList&)));
-		
+
 		QObject::connect(m_session, SIGNAL(gotWebcamInvite(const QString&)), this, SLOT(slotGotWebcamInvite(const QString&)));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamNotAvailable(const QString&)), this, SLOT(slotWebcamNotAvailable(const QString&)));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamImageReceived(const QString&, const QPixmap& )), this, SLOT(slotGotWebcamImage(const QString&, const QPixmap& )));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamClosed(const QString&, int )), this, SLOT(slotWebcamClosed(const QString&, int )));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamPaused(const QString&)), this, SLOT(slotWebcamPaused(const QString&)));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamReadyForTransmission()), this, SLOT(slotWebcamReadyForTransmission()));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamStopTransmission()), this, SLOT(slotWebcamStopTransmission()));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamViewerJoined(const QString&)), this, SLOT(slotWebcamViewerJoined(const QString&)));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamViewerLeft(const QString&)), this, SLOT(slotWebcamViewerLeft(const QString&)));
-		
+
 		QObject::connect(m_session, SIGNAL(webcamViewerRequest(const QString&)), this, SLOT(slotWebcamViewerRequest( const QString&)));
-		
-		QObject::connect(m_session, SIGNAL(pictureStatusNotify( const QString&, int )), SLOT(slotPictureStatusNotiy( const QString&, int)));
-		
-		QObject::connect(m_session, SIGNAL(pictureDownloaded(const QString&, KTempFile*, int)), this, SLOT(slotGotBuddyIcon(const QString&, KTempFile*, int)) );
+
+		QObject::connect(m_session, SIGNAL(pictureStatusNotify( const QString&, int )), SLOT(slotPictureStatusNotify( const QString&, int)));
+
+		QObject::connect(m_session, SIGNAL(pictureDownloaded(const QString&, const QByteArray &, int)), this, SLOT(slotGotBuddyIcon(const QString&, const QByteArray &, int)) );
 
 		QObject::connect(m_session, SIGNAL(pictureInfoNotify(const QString&, KURL, int)), this, SLOT(slotGotBuddyIconInfo(const QString&, KURL, int )));
 
 		QObject::connect(m_session, SIGNAL(pictureChecksumNotify(const QString&, int)), this, SLOT(slotGotBuddyIconChecksum(const QString&, int )));
-		
+
 		QObject::connect(m_session, SIGNAL(pictureRequest(const QString&)), this, SLOT(slotGotBuddyIconRequest(const QString&)) );
 
-		QObject::connect(m_session, SIGNAL(pictureUploaded( const QString &)), this, SLOT(slotBuddyIconChanged(const QString&)));
-		
+		QObject::connect(m_session, SIGNAL(pictureUploaded( const QString &, int)), this, SLOT(slotBuddyIconChanged(const QString&, int)));
+
 		QObject::connect(m_session, SIGNAL(gotYABEntry( YABEntry * )), this, SLOT(slotGotYABEntry( YABEntry * )));
-		
+
 		QObject::connect(m_session, SIGNAL(modifyYABEntryError( YABEntry *, const QString & )), this, SLOT(slotModifyYABEntryError( YABEntry *, const QString & )));
-		
+
 		QObject::connect(m_session, SIGNAL(gotYABRevision( long, bool )), this, SLOT(slotGotYABRevision( long , bool )) );
+
+		QObject::connect(m_session, SIGNAL(chatRoomJoined(int,int,QString,QString)), this, SLOT(slotChatJoined(int,int,QString,QString)));
+
+		QObject::connect(m_session, SIGNAL(chatBuddyHasJoined(QString,QString,bool)), this, SLOT(slotChatBuddyHasJoined(QString,QString,bool)));
+
+		QObject::connect(m_session, SIGNAL(chatBuddyHasLeft(QString,QString)), this, SLOT(slotChatBuddyHasLeft(QString,QString)));
+
+		QObject::connect(m_session, SIGNAL(chatMessageReceived(QString,QString,QString)), this, SLOT(slotChatMessageReceived(QString,QString,QString)));
 	}
 
 	if ( sct == DeleteConnections )
 	{
 		QObject::disconnect(m_session, SIGNAL(loggedIn(int, const QString &)),
 		                    this, SLOT(slotLoginResponse(int, const QString &)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(disconnected()),
 		                    this, SLOT(slotDisconnected()) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(loginFailed()),
 		                    this, SLOT(slotLoginFailed()) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(error(int)),
 		                 this, SLOT(slotError(int)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotBuddy(const QString &, const QString &, const QString &)),
 		                    this, SLOT(slotGotBuddy(const QString &, const QString &, const QString &)));
-		
+
+		QObject::disconnect(m_session, SIGNAL(buddyAddResult(const QString &, const QString &, bool)),
+		                    this, SLOT(slotBuddyAddResult(const QString &, const QString &, bool)));
+
+		QObject::disconnect(m_session, SIGNAL(buddyRemoveResult(const QString &, const QString &, bool)),
+		                    this, SLOT(slotBuddyRemoveResult(const QString &, const QString &, bool)));
+
+		QObject::disconnect(m_session, SIGNAL(buddyChangeGroupResult(const QString &, const QString &, bool)),
+				 this, SLOT(slotBuddyChangeGroupResult(const QString &, const QString &, bool)));
+
 		QObject::disconnect(m_session, SIGNAL(authorizationAccepted( const QString &)),
 		                 this, SLOT(slotAuthorizationAccepted( const QString &)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(authorizationRejected( const QString &, const QString &)),
 		                    this, SLOT(slotAuthorizationRejected( const QString &, const QString & )) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotAuthorizationRequest( const QString &, const QString &, const QString & )),
 		                 this, SLOT(slotgotAuthorizationRequest( const QString &, const QString &, const QString & )) );
-		
-		QObject::disconnect(m_session, SIGNAL(statusChanged(const QString&, int, const QString&, int, int)),
-		                    this, SLOT(slotStatusChanged(const QString&, int, const QString&, int, int)));
-		
-		QObject::disconnect(m_session, SIGNAL(stealthStatusChanged(const QString &, Yahoo::StealthStatus)), 
+
+		QObject::disconnect(m_session, SIGNAL(statusChanged(const QString&,int,const QString&,int,int,int)),
+		                    this, SLOT(slotStatusChanged(const QString&,int,const QString&,int,int,int)));
+
+		QObject::disconnect(m_session, SIGNAL(stealthStatusChanged(const QString &, Yahoo::StealthStatus)),
 		                 this, SLOT(slotStealthStatusChanged( const QString &, Yahoo::StealthStatus)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotIm(const QString&, const QString&, long, int)),
 		                    this, SLOT(slotGotIm(const QString &, const QString&, long, int)));
 
 		QObject::disconnect(m_session, SIGNAL(gotBuzz(const QString&, long)),
 		                    this, SLOT(slotGotBuzz(const QString &, long)));
-		
+
 		QObject::disconnect(m_session,
 		                    SIGNAL( gotConferenceInvite( const QString&, const QString&,
 		                                           const QString&, const QStringList&) ),
-		                    this, 
+		                    this,
 		                    SLOT( slotGotConfInvite( const QString&, const QString&,
 		                                             const QString&, const QStringList&) ) );
-		
+
 		QObject::disconnect(m_session,
 		                    SIGNAL(confUserDeclined(const QString&, const QString &, const QString &)),
 		                    this,
 		                    SLOT(slotConfUserDecline( const QString &, const QString &, const QString& ) ) );
-		
+
 		QObject::disconnect(m_session , SIGNAL(confUserJoined( const QString &, const QString &)),
 		                    this, SLOT(slotConfUserJoin( const QString &, const QString &)) );
-		
+
 		QObject::disconnect(m_session , SIGNAL(confUserLeft( const QString &, const QString &)),
 		                    this, SLOT(slotConfUserLeave( const QString &, const QString &)) );
-		
+
 		QObject::disconnect(m_session , SIGNAL(gotConferenceMessage( const QString &, const QString &, const QString &)), this,
 		                    SLOT(slotConfMessage( const QString &, const QString &, const QString &)) );
-		
+
 		QObject::disconnect(m_session,
 		                    SIGNAL(incomingFileTransfer(const QString &, const QString &,
-		                                   long, const QString &, const QString &, unsigned long)),
+			                    long, const QString &, const QString &, unsigned long, const QPixmap &)),
 		                    this,
 		                    SLOT(slotGotFile(const QString&, const QString&,
-		                                     long, const QString&, const QString&, unsigned long)));
-		
+		                                     long, const QString&, const QString&, unsigned long, const QPixmap &)));
+
 		QObject::disconnect(m_session, SIGNAL(fileTransferComplete(unsigned int)), this,
 		                 SLOT(slotFileTransferComplete(unsigned int)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this,
 		                 SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(fileTransferError(unsigned int,int,const QString &)), this,
 		                 SLOT(slotFileTransferError(unsigned int,int,const QString &)) );
-		
+
 		QObject::disconnect(m_session, SIGNAL(typingNotify(const QString &, int)), this ,
 		                    SLOT(slotTypingNotify(const QString &, int)));
-		
+
 // 		QObject::disconnect(m_session, SIGNAL(gameNotify(const QString &, int)), this,
 // 		                    SLOT(slotGameNotify( const QString &, int)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(mailNotify(const QString&, const QString&, int)), this,
 		                    SLOT(slotMailNotify(const QString &, const QString&, int)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(systemMessage(const QString&)), this,
 		                    SLOT(slotSystemMessage(const QString &)));
-		
+
 // 		QObject::disconnect(m_session, SIGNAL(gotIdentities(const QStringList &)), this,
 // 		                    SLOT(slotGotIdentities( const QStringList&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotWebcamInvite(const QString&)), this, SLOT(slotGotWebcamInvite(const QString&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamNotAvailable(const QString&)), this, SLOT(slotWebcamNotAvailable(const QString&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamImageReceived(const QString&, const QPixmap& )), this, SLOT(slotGotWebcamImage(const QString&, const QPixmap& )));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamClosed(const QString&, int )), this, SLOT(slotWebcamClosed(const QString&, int )));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamPaused(const QString&)), this, SLOT(slotWebcamPaused(const QString&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamReadyForTransmission()), this, SLOT(slotWebcamReadyForTransmission()));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamStopTransmission()), this, SLOT(slotWebcamStopTransmission()));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamViewerJoined(const QString&)), this, SLOT(slotWebcamViewerJoined(const QString&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamViewerLeft(const QString&)), this, SLOT(slotWebcamViewerLeft(const QString&)));
-		
+
 		QObject::disconnect(m_session, SIGNAL(webcamViewerRequest(const QString&)), this, SLOT(slotWebcamViewerRequest( const QString&)));
-		
-		QObject::disconnect(m_session, SIGNAL(pictureDownloaded(const QString&, KTempFile*, int )), this, SLOT(slotGotBuddyIcon(const QString&, KTempFile*,int )));
+
+		QObject::disconnect(m_session, SIGNAL(pictureDownloaded(const QString&, const QByteArray &, int )), this, SLOT(slotGotBuddyIcon(const QString&, const QByteArray &,int )));
 
 		QObject::disconnect(m_session, SIGNAL(pictureInfoNotify(const QString&, KURL, int)), this, SLOT(slotGotBuddyIconInfo(const QString&, KURL, int )));
-	
-		QObject::disconnect(m_session, SIGNAL(gotBuddyIconRequest(const QString&)), this, SLOT(slotGotBuddyIconRequest(const QString&)) );
-		
-		QObject::disconnect(m_session, SIGNAL(pictureUploaded( const QString & )), this, SLOT(slotBuddyIconChanged(const QString&)));
-	
-		QObject::disconnect(m_session, SIGNAL(pictureStatusNotify( const QString&, int )), this, SLOT(slotPictureStatusNotiy( const QString&, int)));
-		
+
+		QObject::disconnect(m_session, SIGNAL(pictureRequest(const QString&)), this, SLOT(slotGotBuddyIconRequest(const QString&)) );
+
+		QObject::disconnect(m_session, SIGNAL(pictureUploaded( const QString &, int )), this, SLOT(slotBuddyIconChanged(const QString&, int)));
+
+		QObject::disconnect(m_session, SIGNAL(pictureStatusNotify( const QString&, int )), this, SLOT(slotPictureStatusNotify( const QString&, int)));
+
 		QObject::disconnect(m_session, SIGNAL(pictureChecksumNotify(const QString&, int)), this, SLOT(slotGotBuddyIconChecksum(const QString&, int )));
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotYABEntry( YABEntry * )), this, SLOT(slotGotYABEntry( YABEntry * )));
-		
+
 		QObject::disconnect(m_session, SIGNAL(modifyYABEntryError( YABEntry *, const QString & )), this, SLOT(slotModifyYABEntryError( YABEntry *, const QString & )));
-		
+
 		QObject::disconnect(m_session, SIGNAL(gotYABRevision( long, bool )), this, SLOT(slotGotYABRevision( long , bool )) );
+
+		QObject::disconnect(m_session, SIGNAL(chatRoomJoined(int,int,const QString&,const QString&)), this, SLOT(slotChatJoined(int,int,const QString&,const QString&)));
+
+		QObject::disconnect(m_session, SIGNAL(chatBuddyHasJoined(const QString&,const QString&,bool)), this, SLOT(slotChatBuddyHasJoined(const QString&,const QString&,bool)));
+
+		QObject::disconnect(m_session, SIGNAL(chatBuddyHasLeft(const QString&,const QString&)), this, SLOT(slotChatBuddyHasLeft(const QString&,const QString&)));
+
+		QObject::disconnect(m_session, SIGNAL(chatMessageReceived(const QString&,const QString&,const QString&)), this, SLOT(slotChatMessageReceived(const QString&,const QString&,const QString&)));
 	}
 }
 
 void YahooAccount::connectWithPassword( const QString &passwd )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if ( isAway() )
 	{
 		slotGoOnline();
 		return;
 	}
 
-	if ( isConnected() || 
+	if ( isConnected() ||
 	     myself()->onlineStatus() == m_protocol->Connecting )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." <<endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." << endl;
 		return;
-	
+
 	}
 
 	if ( passwd.isNull() )
@@ -503,17 +538,17 @@ void YahooAccount::connectWithPassword( const QString &passwd )
 		static_cast<YahooContact*>( myself() )->setOnlineStatus( m_protocol->Offline );
 		return;
 	}
-	
-	QString server = configGroup()->readEntry( "Server", "scs.msg.yahoo.com" );
+
+	QString server = configGroup()->readEntry( "Server", "scsa.msg.yahoo.com" );
 	int port = configGroup()->readNumEntry( "Port", 5050 );
-	
+
 	initConnectionSignals( MakeConnections );
 
 	//YahooSessionManager::manager()->setPager( server, port );
 	//m_session = YahooSessionManager::manager()->createSession( accountId(), passwd );
-	kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":" 
+	kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":"
 		<< port << ">. user <" << accountId() << ">"  << endl;
-	static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting );	
+	static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting );
 	m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) );
 	m_session->connect( server, port, accountId().lower(), passwd );
 }
@@ -527,37 +562,49 @@ void YahooAccount::disconnect()
 	{
 		kdDebug(YAHOO_GEN_DEBUG) <<  "Attempting to disconnect from Yahoo server " << endl;
 
+		disconnected( Manual );
 		m_session->close();
 		static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
 
+		// FIXME: to check
+		//QHash<QString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd();
+		//for ( it = contacts().constBegin(); it != itEnd; ++it )
+		//	static_cast<YahooContact *>( it.value() )->setOnlineStatus( m_protocol->Offline );
 		for ( QDictIterator<Kopete::Contact> i( contacts() ); i.current(); ++i )
 			static_cast<YahooContact *>( i.current() )->setOnlineStatus( m_protocol->Offline );
-		
-		disconnected( Manual );
+
+		static_cast<YahooContact*>( myself() )->setOnlineStatus( m_protocol->Offline );
 	}
 	else
 	{       //make sure we set everybody else offline explicitly, just for cleanup
 		kdDebug(YAHOO_GEN_DEBUG) << "Cancelling active login attempts (not fully connected)." << endl;
 		m_session->cancelConnect();
 
+		// FIXME: to check
+		//QHash<QString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd();
+		//for ( it = contacts().constBegin(); it != itEnd; ++it )
+		//	static_cast<YahooContact*>( it.value() )->setOnlineStatus( m_protocol->Offline );
 		for ( QDictIterator<Kopete::Contact> i(contacts()); i.current(); ++i )
 			static_cast<YahooContact*>( i.current() )->setOnlineStatus( m_protocol->Offline );
+
+		static_cast<YahooContact*>( myself() )->setOnlineStatus( m_protocol->Offline );
 	}
 
 	initConnectionSignals( DeleteConnections );
+	setupActions( false );
 	theHaveContactList = false;
 }
 
 void YahooAccount::verifyAccount( const QString &word )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Word: s" << word << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Word: s" << word << endl;
 	m_session->setVerificationWord( word );
 	disconnected( BadPassword );
 }
 
 void YahooAccount::setAway(bool status, const QString &awayMessage)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 
 	if( awayMessage.isEmpty() )
 		slotGoStatus( status ? 2 : 0 );
@@ -567,12 +614,12 @@ void YahooAccount::setAway(bool status, const QString &awayMessage)
 
 void YahooAccount::slotConnected()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Moved to slotLoginResponse for the moment" << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Moved to slotLoginResponse for the moment" << endl;
 }
 
 void YahooAccount::slotGoOnline()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !isConnected() )
 		connect( m_protocol->Online );
 	else
@@ -587,17 +634,27 @@ void YahooAccount::slotGoOffline()
 		static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
 }
 
-KActionMenu *YahooAccount::actionMenu()
+KActionMenu* YahooAccount::actionMenu()
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+
+	// FIXME (to check)
+	//Kopete::Account::fillActionMenu( actionMenu );
 	KActionMenu *theActionMenu = Kopete::Account::actionMenu();
-	
+
+	// FIXME: (to check)
+	//actionMenu->addSeparator();
+	//actionMenu->addAction( m_openInboxAction );
+	//actionMenu->addAction( m_openYABAction );
+	//actionMenu->addAction( m_editOwnYABEntry );
+	//actionMenu->addAction( m_joinChatAction );
+
 	theActionMenu->popupMenu()->insertSeparator();
 	theActionMenu->insert( m_editOwnYABEntry );
 	theActionMenu->insert( m_openInboxAction );
 	theActionMenu->insert( m_openYABAction );
-	
+	theActionMenu->insert( m_joinChatAction );
+
 	return theActionMenu;
 }
 
@@ -608,7 +665,7 @@ YahooContact *YahooAccount::contact( const QString &id )
 
 bool YahooAccount::createContact(const QString &contactId, Kopete::MetaContact *parentContact )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << " contactId: " << contactId << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId;
 
 	if(!contact(contactId))
 	{
@@ -616,38 +673,40 @@ bool YahooAccount::createContact(const QString &contactId, Kopete::MetaContact *
 		// How on earth do you tell if a contact is being deserialised or added brand new here?
 			// -- actualy (oct 2004) this method is only called when new contact are added.  but this will
 			//    maybe change and you will be noticed   --Olivier
-		YahooContact *newContact = new YahooContact( this, contactId, 
+		YahooContact *newContact = new YahooContact( this, contactId,
 		                                             parentContact->displayName(), parentContact );
 		return newContact != 0;
 	}
 	else
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Contact already exists" << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Contact already exists" << endl;
 
 	return false;
 }
 
-void YahooAccount::slotGlobalIdentityChanged( const QString &key, const QVariant &value )
+bool YahooAccount::createChatContact(const QString &nick)
 {
-	if( !configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) )
-	{
-		if ( key == Kopete::Global::Properties::self()->photo().key() )
-		{
-			setBuddyIcon( KURL( value.toString() ) );
-		}
-	}
+	Kopete::MetaContact *m = new Kopete::MetaContact;
+	m->setTemporary( true );
+	return createContact( nick, m );
 }
 
 void YahooAccount::sendFile( YahooContact *to, const KURL &url )
-{	
+{
 	QFile file( url.path() );
-	
+
 	Kopete::Transfer *transfer = Kopete::TransferManager::transferManager()->addTransfer ( to,
 		url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing );
 	m_session->sendFile( transfer->info().transferId(), to->userId(), QString(), url );
-	
+
 	QObject::connect( transfer, SIGNAL(result( KIO::Job * )), this, SLOT(slotFileTransferResult( KIO::Job * )) );
-	
-	m_fileTransfers.insert( transfer->info().transferId(), transfer );	
+
+	m_fileTransfers.insert( transfer->info().transferId(), transfer );
+}
+
+void YahooAccount::setupActions( bool connected )
+{
+	m_joinChatAction->setEnabled( connected );
+	m_editOwnYABEntry->setEnabled( connected );
 }
 
 /***************************************************************************
@@ -658,8 +717,9 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url )
 
 void YahooAccount::slotLoginResponse( int succ , const QString &url )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << succ << ", " << url << ")]" << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << succ << ", " << url << ")]" << endl;
 	QString errorMsg;
+	setupActions( succ == Yahoo::LoginOk );
 	if ( succ == Yahoo::LoginOk || (succ == Yahoo::LoginDupl && m_lastDisconnectCode == 2) )
 	{
 		if ( initialStatus().internalStatus() )
@@ -671,9 +731,10 @@ void YahooAccount::slotLoginResponse( int succ , const QString &url )
 			static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Online );
 		}
 
-		 
+
 		setBuddyIcon( myself()->property( Kopete::Global::Properties::self()->photo() ).value().toString() );
 		m_session->getYABEntries( m_YABLastMerge, m_YABLastRemoteRevision );
+		IDs.clear();
 		m_lastDisconnectCode = 0;
 		theHaveContactList = true;
 		return;
@@ -689,7 +750,7 @@ void YahooAccount::slotLoginResponse( int succ , const QString &url )
 	else if(succ == Yahoo::LoginLock)
 	{
 		initConnectionSignals( DeleteConnections );
-		errorMsg = i18n("Could not log into Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url);
+		errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url);
 		KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg);
 		static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
 		disconnected( BadUserName ); // FIXME: add a more appropriate disconnect reason
@@ -730,13 +791,14 @@ void YahooAccount::slotLoginResponse( int succ , const QString &url )
 
 void YahooAccount::slotDisconnected()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	initConnectionSignals( DeleteConnections );
+	setupActions( false );
 	if( !isConnected() )
 		return;
 	static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
 	disconnected( ConnectionReset );	// may reconnect
-	
+
 	QString message;
 	message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" )
 		.arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() );
@@ -745,33 +807,34 @@ void YahooAccount::slotDisconnected()
 
 void YahooAccount::slotLoginFailed()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	initConnectionSignals( DeleteConnections );
 	static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
 	disconnected( Manual );			// don't reconnect
-	
+
 	QString message;
 	message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" )
-		.arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() );
+		.arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() );
 	KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() );
 }
 
 void YahooAccount::slotError( int level )
 {
-	// enum LogLevel { Debug, Info, Notice, Warning, Error, Critical }; 
+	// enum LogLevel { Debug, Info, Notice, Warning, Error, Critical };
 	if( level <= Client::Notice )
 		return;
 	else if( level <= Client::Warning )
-		KMessageBox::information( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3" ).arg(m_session->errorInformation())
-		                          .arg(m_session->error()).arg(m_session->errorString()), i18n( "Yahoo Plugin" ) );
-	else 
-		KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2 - %3" ).arg(m_session->errorInformation())
-		                    .arg(m_session->error()).arg(m_session->errorString()), i18n( "Yahoo Plugin" ) );
+		KMessageBox::information( Kopete::UI::Global::mainWidget(),
+			i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ),
+			i18n( "Yahoo Plugin" ) );
+	else
+		KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" )
+			.arg( m_session->errorInformation() ).arg(  m_session->errorString() ), i18n( "Yahoo Plugin" ) );
 }
 
 void YahooAccount::slotGotBuddy( const QString &userid, const QString &alias, const QString &group )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	IDs[userid] = QPair<QString, QString>(group, alias);
 
 	// Serverside -> local
@@ -781,50 +844,101 @@ void YahooAccount::slotGotBuddy( const QString &userid, const QString &alias, co
 		Kopete::Group *g=Kopete::ContactList::self()->findGroup(group);
 		addContact(userid, alias.isEmpty() ? userid : alias, g, Kopete::Account::ChangeKABC);
 	}
+
+	// FIXME (same)
+	//kdDebug(YAHOO_GEN_DEBUG) << IDs << endl;
+}
+
+void YahooAccount::slotBuddyAddResult( const QString &userid, const QString &group, bool success )
+{
+     kdDebug(YAHOO_GEN_DEBUG) << success << endl;
+
+     if(success)
+	  IDs[userid] = QPair<QString, QString>(group, QString());
+
+	// FIXME (same)
+	//kdDebug(YAHOO_GEN_DEBUG) << IDs << endl;
+}
+
+void YahooAccount::slotBuddyRemoveResult( const QString &userid, const QString &group, bool success )
+{
+     kdDebug(YAHOO_GEN_DEBUG);
+
+     // Ignore success here, the only reason this will fail is because the
+     // contact isn't on the server's list, so we shouldn't have them in our
+     // list either.
+     IDs.remove(userid);
+
+	// FIXME
+	// kdDebug(YAHOO_GEN_DEBUG) << IDs << endl;
+}
+
+void YahooAccount::slotBuddyChangeGroupResult(const QString &userid, const QString &group, bool success)
+{
+     kdDebug(YAHOO_GEN_DEBUG);
+
+     if(success)
+	  IDs[userid] = QPair<QString, QString>(group, QString());
+
+	// FIXME
+	//kdDebug(YAHOO_GEN_DEBUG) << IDs << endl;
 }
 
 void YahooAccount::slotAuthorizationAccepted( const QString &who )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	QString message;
-	message = i18n( "User %1 has granted your authorization request." )
-		.arg( who );
-	KNotification::event( "kopete_authorization", message, 0 , 0 , 0 );
-	
+	message = i18n( "User %1 has granted your authorization request." ).arg( who );
+	KNotification::event( QString::fromLatin1("kopete_authorization"), message );
+
 	if( contact( who ) )
 		contact( who )->setOnlineStatus( m_protocol->Online );
 }
 
 void YahooAccount::slotAuthorizationRejected( const QString &who, const QString &msg )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	QString message;
-	message = i18n( "User %1 has granted your authorization request.\n%2" )
+	message = i18n( "User %1 has rejected your authorization request.\n%2" )
 		.arg( who ).arg( msg );
-	KNotification::event( "kopete_authorization", message, 0 , 0 , 0 );
+	KNotification::event( QString::fromLatin1("kopete_authorization"), message );
 }
 
 void YahooAccount::slotgotAuthorizationRequest( const QString &user, const QString &msg, const QString &name )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	Q_UNUSED( msg );
 	Q_UNUSED( name );
 	YahooContact *kc = contact( user );
 	Kopete::MetaContact *metaContact=0L;
 	if(kc)
 		metaContact=kc->metaContact();
-	
+
+	// FIXME: to check
+	//Kopete::AddedInfoEvent::ShowActionOptions actions = Kopete::AddedInfoEvent::AuthorizeAction;
+	//actions |= Kopete::AddedInfoEvent::BlockAction;
+	//if( !metaContact || metaContact->isTemporary() )
+	//	actions |= Kopete::AddedInfoEvent::AddAction;
+
+	//Kopete::AddedInfoEvent* event = new Kopete::AddedInfoEvent( user, this );
+	//QObject::connect( event, SIGNAL(actionActivated(uint)),
+	//                  this, SLOT(slotAddedInfoEventActionActivated(uint)) );
+
+	//event->showActions( actions );
+	//event->sendEvent();
+
 	int hideFlags=Kopete::UI::ContactAddedNotifyDialog::InfoButton;
 	if( metaContact && !metaContact->isTemporary() )
-		hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ;
-	
+			hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ;
+
 	Kopete::UI::ContactAddedNotifyDialog *dialog=
-		new Kopete::UI::ContactAddedNotifyDialog( user,QString::null,this, hideFlags );
+			new Kopete::UI::ContactAddedNotifyDialog( user,QString::null,this, hideFlags );
 	QObject::connect(dialog,SIGNAL(applyClicked(const QString&)),
-	                 this,SLOT(slotContactAddedNotifyDialogClosed(const QString& )));
+			this,SLOT(slotContactAddedNotifyDialogClosed(const QString& )));
 	dialog->show();
 }
 
+
 void YahooAccount::slotContactAddedNotifyDialogClosed( const QString &user )
 {
 	const Kopete::UI::ContactAddedNotifyDialog *dialog =
@@ -840,24 +954,45 @@ void YahooAccount::slotContactAddedNotifyDialogClosed( const QString &user )
 	}
 }
 
+
+/*void YahooAccount::slotAddedInfoEventActionActivated( uint actionId )
+{
+	const Kopete::AddedInfoEvent *event = dynamic_cast<const Kopete::AddedInfoEvent *>(sender());
+	if( !event || !isConnected() )
+		return;
+
+	switch ( actionId )
+	{
+	case Kopete::AddedInfoEvent::AuthorizeAction:
+		m_session->sendAuthReply( event->contactId(), true, QString() );
+		break;
+	case Kopete::AddedInfoEvent::BlockAction:
+		m_session->sendAuthReply( event->contactId(), false, QString() );
+		break;
+	case Kopete::AddedInfoEvent::AddContactAction:
+		event->addContact();
+		break;
+	}
+}*/
+
 void YahooAccount::slotGotIgnore( const QStringList & /* igns */ )
 {
-	//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	//kdDebug(YAHOO_GEN_DEBUG) ;
 }
 
 void YahooAccount::slotGotIdentities( const QStringList & /* ids */ )
 {
-	//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	//kdDebug(YAHOO_GEN_DEBUG) ;
 }
 
-void YahooAccount::slotStatusChanged( const QString &who, int stat, const QString &msg, int away, int idle )
+void YahooAccount::slotStatusChanged( const QString &who, int stat, const QString &msg, int away, int idle, int pictureChecksum )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << who << " status: " << stat << " msg: " << msg << " away: " << away << " idle: " << idle <<endl;
+	kdDebug(YAHOO_GEN_DEBUG) << who << " status: " << stat << " msg: " << msg << " away: " << away << " idle: " << idle << endl;
 	YahooContact *kc = contact( who );
-	
+
 	if( contact( who ) == myself() )
 		return;
-	
+
 	if ( kc )
 	{
 		Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat );
@@ -871,37 +1006,39 @@ void YahooAccount::slotStatusChanged( const QString &who, int stat, const QStrin
 		else
 			kc->removeProperty( m_protocol->awayMessage );
 
-		if( newStatus != m_protocol->Offline &&
-		    oldStatus == m_protocol->Offline && contact(who) != myself() )
+		// from original file
+		if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() )
 		{
-			//m_session->requestBuddyIcon( who );		// Try to get Buddy Icon
+			//m_session->requestBuddyIcon( who );           // Try to get Buddy Icon
 
 			if ( !myself()->property( Kopete::Global::Properties::self()->photo() ).isNull() &&
-					myself()->onlineStatus() != m_protocol->Invisible && 
+					myself()->onlineStatus() != m_protocol->Invisible &&
 					!kc->stealthed() )
 			{
 				kc->sendBuddyIconUpdate( m_session->pictureFlag() );
 				kc->sendBuddyIconChecksum( myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() );
 			}
 		}
-		
+
 		//if( newStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) {
 		if( newStatus == m_protocol->Idle )
 			kc->setIdleTime( idle ? idle : 1 );
 		else
 			kc->setIdleTime( 0 );
-		
+
 		kc->setOnlineStatus( newStatus );
+
+		slotGotBuddyIconChecksum( who, pictureChecksum );
 	}
 }
 
 void YahooAccount::slotStealthStatusChanged( const QString &who, Yahoo::StealthStatus state )
 {
-	//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Stealth Status of " << who << "changed to " << state << endl;
-	
+	//kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state;
+
 	YahooContact* kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 	kc->setStealthed( state == Yahoo::StealthActive );
@@ -913,11 +1050,11 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 	QRegExp regExp;
 	int pos = 0;
 	newMsgText = stripMsgColorCodes( newMsgText );
-	
+
 	kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl;
-	
+
 	newMsgText.replace( QString::fromLatin1( "&" ), QString::fromLatin1( "&amp;" ) );
-	
+
 	// Replace Font tags
 	regExp.setMinimal( true );
 	regExp.setPattern( "<font([^>]*)size=\"([^>]*)\"([^>]*)>" );
@@ -929,7 +1066,7 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 		newMsgText.replace( regExp, QString::fromLatin1("<font\\1style=\"font-size:\\2pt\">" ) );
 		}
 	}
-	
+
 	// Remove FADE and ALT tags
 	regExp.setPattern( "<[/]*FADE([^>]*)>" );
 	pos = 0;
@@ -937,8 +1074,8 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 		pos = regExp.search( newMsgText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsgText.replace( regExp, QString::fromLatin1("" ) );
-		
+			newMsgText.remove( regExp );
+
 		}
 	}
 	regExp.setPattern( "<[/]*ALT([^>]*)>" );
@@ -947,10 +1084,10 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 		pos = regExp.search( newMsgText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsgText.replace( regExp, QString::fromLatin1("" ) );
+			newMsgText.remove( regExp );
 		}
 	}
-	
+
 	// Replace < and > in text
 	regExp.setPattern( "<(?!(/*(font.*|[\"fbui])>))" );
 	pos = 0;
@@ -970,7 +1107,7 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 			newMsgText.replace( regExp, QString::fromLatin1("\\1&gt;" ) );
 		}
 	}
-	
+
 	// add closing tags when needed
 	regExp.setMinimal( false );
 	regExp.setPattern( "(<b>.*)(?!</b>)" );
@@ -981,9 +1118,9 @@ QString YahooAccount::prepareIncomingMessage( const QString &messageText )
 	newMsgText.replace( regExp, QString::fromLatin1("\\1</u>" ) );
 	regExp.setPattern( "(<font.*)(?!</font>)" );
 	newMsgText.replace( regExp, QString::fromLatin1("\\1</font>" ) );
-	
+
 	newMsgText.replace( QString::fromLatin1( "\r" ), QString::fromLatin1( "<br/>" ) );
-	
+
 	return newMsgText;
 }
 
@@ -992,36 +1129,40 @@ void YahooAccount::slotGotIm( const QString &who, const QString &msg, long tm, i
 	QFont msgFont;
 	QDateTime msgDT;
 	Kopete::ContactPtrList justMe;
-	
+
 	if( !contact( who ) )
 	{
 		kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << who << endl;
 		addContact( who,who,  0L, Kopete::Account::Temporary );
 	}
-	
+
 	//Parse the message for it's properties
 	kdDebug(YAHOO_GEN_DEBUG) << "Original message is '" << msg << "'" << endl;
-	//kdDebug(YAHOO_GEN_DEBUG) << "Message color is " << getMsgColor(msg) << endl;
+	//kdDebug(YAHOO_GEN_DEBUG) << "Message color is " << getMsgColor(msg);
 	QColor fgColor = getMsgColor( msg );
+
+	// FIXME to check
 	if (tm == 0)
+		//msgDT = QDateTime( QDate::currentDate(), QTime::currentTime(), Qt::LocalTime );
 		msgDT.setTime_t(time(0L));
 	else
+		//msgDT = QDateTime::fromTime_t(tm);
 		msgDT.setTime_t(tm, Qt::LocalTime);
-	
+
 	QString newMsgText = prepareIncomingMessage( msg );
-	
+
 	kdDebug(YAHOO_GEN_DEBUG) << "Message after fixing font tags '" << newMsgText << "'" << endl;
-	
+
 	Kopete::ChatSession *mm = contact(who)->manager(Kopete::Contact::CanCreate);
-	
+
 	// Tell the message manager that the buddy is done typing
 	mm->receivedTypingMsg(contact(who), false);
-	
+
 	justMe.append(myself());
-	
+
 	Kopete::Message kmsg(msgDT, contact(who), justMe, newMsgText,
-	                     Kopete::Message::Inbound , Kopete::Message::RichText);
-	
+		Kopete::Message::Inbound , Kopete::Message::RichText);
+
 	kmsg.setFg( fgColor );
 	mm->appendMessage(kmsg);
 }
@@ -1031,27 +1172,31 @@ void YahooAccount::slotGotBuzz( const QString &who, long tm )
 	QFont msgFont;
 	QDateTime msgDT;
 	Kopete::ContactPtrList justMe;
-	
+
 	if( !contact( who ) )
 	{
 		kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << who << endl;
 		addContact( who,who,  0L, Kopete::Account::Temporary );
 	}
-	
+
+	// FIXME: to check
 	if (tm == 0)
+		//msgDT = QDateTime( QDate::currentDate(), QTime::currentTime(), Qt::LocalTime );
 		msgDT.setTime_t(time(0L));
 	else
+		//msgDT = QDateTime::fromTime_t(tm);
 		msgDT.setTime_t(tm, Qt::LocalTime);
-	
+
 	justMe.append(myself());
-	
-	QString buzzMsgText = i18n("This string is shown when the user is buzzed by a contact", "Buzz!!");
-	
+
+	QString buzzMsgText = i18n("This string is shown when the user is buzzed by a contact", "Buzz");
+
 	Kopete::Message kmsg(msgDT, contact(who), justMe, buzzMsgText, Kopete::Message::Inbound,
-	                     Kopete::Message::PlainText, QString::null, Kopete::Message::TypeAction);
+		Kopete::Message::PlainText, QString::null, Kopete::Message::TypeAction);
+
 	QColor fgColor( "gold" );
 	kmsg.setFg( fgColor );
-	
+
 	Kopete::ChatSession *mm = contact(who)->manager(Kopete::Contact::CanCreate);
 	mm->appendMessage(kmsg);
 	// Emit the buzz notification.
@@ -1060,20 +1205,20 @@ void YahooAccount::slotGotBuzz( const QString &who, long tm )
 
 void YahooAccount::slotGotConfInvite( const QString & who, const QString & room, const QString &msg, const QStringList &members )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl;
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Members: " << members << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Members: " << members << endl;
+
 	if( !m_pendingConfInvites.contains( room ) )	// We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host
 		m_pendingConfInvites.push_back( room );
 	else
 	{
 		return;
 	}
-	
+
 	QString m = who;
 	QStringList myMembers;
 	myMembers.push_back( who );
-	for( QStringList::const_iterator it = ++members.begin(); it != members.end(); it++ )
+	for( QStringList::const_iterator it = ++members.constBegin(); it != members.constEnd(); ++it )
 	{
 		if( *it != m_session->userId() )
 		{
@@ -1081,9 +1226,9 @@ void YahooAccount::slotGotConfInvite( const QString & who, const QString & room,
 			myMembers.push_back( *it );
 		}
 	}
-	if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), 
-				i18n("%1 has invited you to join a conference with %2.\n\nHis message: %3\n\n Accept?")
-				.arg(who).arg(m).arg(msg), QString::null, i18n("Accept"), i18n("Ignore") ) )
+	if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
+		i18n("%1 has invited you to join a conference with %2.\n\nHis/her message: %3\n\nAccept?")
+		.arg(who).arg(m).arg(msg), QString(), i18n("Accept"), i18n("Ignore") ) )
 	{
 		m_session->joinConference( room, myMembers );
 		if( !m_conferences[room] )
@@ -1091,26 +1236,26 @@ void YahooAccount::slotGotConfInvite( const QString & who, const QString & room,
 			Kopete::ContactPtrList others;
 			YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others );
 			m_conferences[room] = session;
-			
+
 			QObject::connect( session, SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, SLOT( slotConfLeave( YahooConferenceChatSession * ) ) );
-			
-			for ( QValueList<QString>::ConstIterator it = myMembers.begin(); it != myMembers.end(); ++it )
+
+			for ( QStringList::ConstIterator it = myMembers.constBegin(); it != myMembers.constEnd(); ++it )
 			{
 				YahooContact * c = contact( *it );
 				if ( !c )
 				{
-					kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Adding contact " << *it << " to conference." << endl;
+					kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << *it << " to conference." << endl;
 					addContact( *it,*it,  0L, Kopete::Account::Temporary );
 					c = contact( *it );
 				}
-				session->joined( c );	
+				session->joined( c );
 			}
 			session->view( true )->raise( false );
 		}
 	}
 	else
-		m_session->declineConference( room, myMembers, QString::null );
-	
+		m_session->declineConference( room, myMembers, QString() );
+
 	m_pendingConfInvites.remove( room );
 }
 
@@ -1123,18 +1268,26 @@ void YahooAccount::prepareConference( const QString &who )
 		room += (c > 25)  ? c + 71 : c + 65;
 	}
 	room = QString("%1-%2--").arg(accountId()).arg(room);
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "The generated roomname is: " << room << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl;
+
 	QStringList buddies;
+
+	// FIXME: to check
+	//QHash<QString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd();
+	//for( it = contacts().constBegin(); it != itEnd; ++it )
+	//{
+	//	buddies.push_back( it.value()->contactId() );
+	//}
+
 	QDictIterator<Kopete::Contact> it( contacts() );
 	for( ; it.current(); ++it )
 	{
 		if( (*it) != myself() )
 			buddies.push_back( (*it)->contactId() );
 	}
-	
+
 	YahooInviteListImpl *dlg = new YahooInviteListImpl( Kopete::UI::Global::mainWidget() );
-	QObject::connect( dlg, SIGNAL( readyToInvite( const QString &, const QStringList &, const QStringList &, const QString & ) ), 
+	QObject::connect( dlg, SIGNAL( readyToInvite( const QString &, const QStringList &, const QStringList &, const QString & ) ),
 			this, SLOT( slotInviteConference( const QString &, const QStringList &, const QStringList &, const QString & ) ) );
 	dlg->setRoom( room );
 	dlg->fillFriendList( buddies );
@@ -1143,54 +1296,54 @@ void YahooAccount::prepareConference( const QString &who )
 }
 
 void YahooAccount::slotInviteConference( const QString &room, const QStringList &members, const QStringList &participants, const QString &msg )
-{	
+{
 	Q_UNUSED( participants );
-kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Inviting " << members << " to the conference " << room << ". Message: " << msg << endl;
+kdDebug(YAHOO_GEN_DEBUG) << "Inviting " << members << " to the conference " << room << ". Message: " << msg << endl;
 	m_session->inviteConference( room, members, msg );
-	
+
 	Kopete::ContactPtrList others;
 	YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others );
 	m_conferences[room] = session;
-	
+
 	QObject::connect( session, SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, SLOT( slotConfLeave( YahooConferenceChatSession * ) ) );
-	
+
 	session->joined( static_cast< YahooContact *>(myself()) );
 	session->view( true )->raise( false );
 }
 
 void YahooAccount::slotAddInviteConference( const QString &room, const QStringList &who, const QStringList &members, const QString &msg )
-{	
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Inviting " << who << " to the conference " << room << ". Message: " << msg << endl;
+{
+	kdDebug(YAHOO_GEN_DEBUG) << "Inviting " << who << " to the conference " << room << ". Message: " << msg << endl;
 	m_session->addInviteConference( room, who, members, msg );
 }
 
 void YahooAccount::slotConfUserDecline( const QString &who, const QString &room, const QString &msg)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) ;
+
 	if( !m_conferences.contains( room ) )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Error. No chatsession for this conference found." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl;
 		return;
 	}
-	
+
 	YahooConferenceChatSession *session = m_conferences[room];
-	
-	QString body = i18n( "%1 declined to join the conference: \"%2\"" ).arg( who ).arg( msg );
-	Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
-	
+
+	QString body = i18n( "%1 has declined to join the conference: \"%2\"").arg( who ).arg( msg );
+    Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
+
 	session->appendMessage( message );
 }
 
 void YahooAccount::slotConfUserJoin( const QString &who, const QString &room )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;	
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !m_conferences.contains( room ) )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Error. No chatsession for this conference found." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl;
 		return;
 	}
-	
+
 	YahooConferenceChatSession *session = m_conferences[room];
 	if( !contact( who ) )
 	{
@@ -1201,13 +1354,13 @@ void YahooAccount::slotConfUserJoin( const QString &who, const QString &room )
 
 void YahooAccount::slotConfUserLeave( const QString & who, const QString &room )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;	
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !m_conferences.contains( room ) )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Error. No chatsession for this conference found." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl;
 		return;
 	}
-	
+
 	YahooConferenceChatSession *session = m_conferences[room];
 	if( !contact( who ) )
 	{
@@ -1218,15 +1371,15 @@ void YahooAccount::slotConfUserLeave( const QString & who, const QString &room )
 
 void YahooAccount::slotConfLeave( YahooConferenceChatSession *s )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !s )
 		return;
 	QStringList members;
-	for( Kopete::ContactPtrList::iterator it = s->members().begin(); it != s->members().end(); ++it )
+	for( Kopete::ContactPtrList::ConstIterator it = s->members().constBegin(); it != s->members().constEnd(); ++it )
 	{
 		if( (*it) == myself() )
 			continue;
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Member: " << (*it)->contactId() << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Member: " << (*it)->contactId() << endl;
 		members.append( (*it)->contactId() );
 	}
 	m_session->leaveConference( s->room(), members );
@@ -1235,53 +1388,53 @@ void YahooAccount::slotConfLeave( YahooConferenceChatSession *s )
 
 void YahooAccount::slotConfMessage( const QString &who, const QString &room, const QString &msg )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) ;
+
 	if( !m_conferences.contains( room ) )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Error. No chatsession for this conference found." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl;
 		return;
 	}
-	
+
 	YahooConferenceChatSession *session = m_conferences[room];
 
 	QFont msgFont;
 	QDateTime msgDT;
 	Kopete::ContactPtrList justMe;
-	
+
 	if( !contact( who ) )
 	{
 		kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << who << endl;
 		addContact( who,who,  0L, Kopete::Account::Temporary );
 	}
 	kdDebug(YAHOO_GEN_DEBUG) << "Original message is '" << msg << "'" << endl;
-	
+
 	QColor fgColor = getMsgColor( msg );
-	msgDT.setTime_t(time(0L));	
-	
+	msgDT.setTime_t(time(0L));
+
 	QString newMsgText = prepareIncomingMessage( msg );
-	
+
 	kdDebug(YAHOO_GEN_DEBUG) << "Message after fixing font tags '" << newMsgText << "'" << endl;
 	session->receivedTypingMsg(contact(who), false);
-	
+
 	justMe.append(myself());
-	
+
 	Kopete::Message kmsg(msgDT, contact(who), justMe, newMsgText,
-	                     Kopete::Message::Inbound , Kopete::Message::RichText);
-	
+		Kopete::Message::Inbound , Kopete::Message::RichText);
+
 	kmsg.setFg( fgColor );
 	session->appendMessage(kmsg);
 }
 
-void YahooAccount::sendConfMessage( YahooConferenceChatSession *s, Kopete::Message &message )
+void YahooAccount::sendConfMessage( YahooConferenceChatSession *s, const Kopete::Message &message )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	QStringList members;
-	for( Kopete::ContactPtrList::iterator it = s->members().begin(); it != s->members().end(); ++it )
+	for( Kopete::ContactPtrList::ConstIterator it = s->members().constBegin(); it != s->members().constEnd(); ++it )
 	{
 		if( (*it) == myself() )
 			continue;
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Member: " << (*it)->contactId() << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Member: " << (*it)->contactId() << endl;
 		members.append( (*it)->contactId() );
 	}
 	m_session->sendConferenceMessage( s->room(), members, YahooContact::prepareMessage( message.escapedBody() ) );
@@ -1291,14 +1444,14 @@ void YahooAccount::slotGotYABRevision( long rev, bool merged )
 {
 	if( merged )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Merge Revision received: " << rev << endl;
-		configGroup()->writeEntry( "YABLastMerge", rev );
+		kdDebug(YAHOO_GEN_DEBUG) << "Merge Revision received: " << rev << endl;
+		configGroup()->writeEntry( "YABLastMerge", (Q_INT64)rev );
 		m_YABLastMerge = rev;
 	}
 	else
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Remote Revision received: " << rev << endl;
-		configGroup()->writeEntry( "YABLastRemoteRevision", rev );
+		kdDebug(YAHOO_GEN_DEBUG) << "Remote Revision received: " << rev << endl;
+		configGroup()->writeEntry( "YABLastRemoteRevision", (Q_INT64)rev );
 		m_YABLastRemoteRevision = rev;
 	}
 }
@@ -1308,12 +1461,12 @@ void YahooAccount::slotGotYABEntry( YABEntry *entry )
 	YahooContact* kc = contact( entry->yahooId );
 	if( !kc )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "YAB entry received for a contact not on our buddylist: " << entry->yahooId << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "YAB entry received for a contact not on our buddylist: " << entry->yahooId << endl;
 		delete entry;
 	}
 	else
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "YAB entry received for: " << entry->yahooId << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "YAB entry received for: " << entry->yahooId << endl;
 		if( entry->source == YABEntry::SourceYAB )
 		{
 			kc->setYABEntry( entry );
@@ -1321,7 +1474,7 @@ void YahooAccount::slotGotYABEntry( YABEntry *entry )
 		else if( entry->source == YABEntry::SourceContact )
 		{
 			entry->YABId = kc->yabEntry()->YABId;
-			YahooUserInfoDialog *dlg = new YahooUserInfoDialog( kc, Kopete::UI::Global::mainWidget(), "yahoo userinfo" );
+			YahooUserInfoDialog *dlg = new YahooUserInfoDialog( kc, Kopete::UI::Global::mainWidget() );
 			dlg->setData( *entry );
 			dlg->setAccountConnected( isConnected() );
 			dlg->show();
@@ -1333,7 +1486,7 @@ void YahooAccount::slotGotYABEntry( YABEntry *entry )
 
 void YahooAccount::slotSaveYABEntry( YABEntry &entry )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "YABId: " << entry.YABId << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "YABId: " << entry.YABId << endl;
 	if( entry.YABId > 0 )
 		m_session->saveYABEntry( entry );
 	else
@@ -1345,34 +1498,36 @@ void YahooAccount::slotModifyYABEntryError( YABEntry *entry, const QString &msg
 	YahooContact* kc = contact( entry->yahooId );
 	if( kc )
 		kc->setYABEntry( entry, true );
-	KMessageBox::sorry( Kopete::UI::Global::mainWidget(), msg, i18n( "Yahoo Plugin" ) );
+	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, msg, i18n( "Yahoo Plugin" ) );
 }
 
-void YahooAccount::slotGotFile( const QString &  who, const QString &  url , long /* expires */, const QString &  msg ,
-	const QString &  fname, unsigned long  fesize  )
+void YahooAccount::slotGotFile( const QString &  who, const QString &  url , long /* expires */, const QString &  msg , const QString &  fname, unsigned long  fesize, const QPixmap &preview )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Received File from " << who << ": " << msg << endl;
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Filename :" << fname << " size:" << fesize << endl;
-	
-	Kopete::TransferManager::transferManager()->askIncomingTransfer( contact( who ) , fname, fesize, msg, url );	
-	
+	kdDebug(YAHOO_GEN_DEBUG) << "Received File from " << who << ": " << msg << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Filename :" << fname << " size:" << fesize << endl;
+
+	// FIXME: preview?
+	Kopete::TransferManager::transferManager()->askIncomingTransfer( contact( who ) , fname, fesize, msg, url /* , preview */ );
+
 	if( m_pendingFileTransfers.empty() )
 	{
-		QObject::connect( Kopete::TransferManager::transferManager(), SIGNAL( accepted( Kopete::Transfer *, const QString& ) ),
-						this, SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const QString& ) ) );
-		QObject::connect( Kopete::TransferManager::transferManager(), SIGNAL( refused(const Kopete::FileTransferInfo& ) ),
-						this, SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) );
+	QObject::connect( Kopete::TransferManager::transferManager(), SIGNAL( accepted( Kopete::Transfer *, const QString& ) ),
+					this, SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const QString& ) ) );
+	QObject::connect( Kopete::TransferManager::transferManager(), SIGNAL( refused(const Kopete::FileTransferInfo& ) ),
+	                  this, SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) );
 	}
 	m_pendingFileTransfers.append( url );
 }
 
 void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const QString& fileName)
-{	
+{
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !m_pendingFileTransfers.contains( transfer->info().internalId() ) )
 		return;
-	
+
 	m_pendingFileTransfers.remove( transfer->info().internalId() );
-	
+
+	// FIXME to check
 	//Create directory if it doesn't already exist
 	QDir dir;
 	QString path = QFileInfo( fileName ).dirPath();
@@ -1380,31 +1535,31 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const QSt
 	{
 		if( !dir.exists( path.section( '/', 0, i ) ) )
 		{
-			dir.mkdir( path.section( '/', 0, i) );
-		}		
+				dir.mkdir( path.section( '/', 0, i) );
+		}
 	}
-	
-	m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName );	
+
+	m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName );
 	m_fileTransfers.insert( transfer->info().transferId(), transfer );
 	QObject::connect( transfer, SIGNAL(result( KIO::Job * )), this, SLOT(slotFileTransferResult( KIO::Job * )) );
-	
+
 	if( m_pendingFileTransfers.empty() )
 	{
 		QObject::disconnect( Kopete::TransferManager::transferManager(), SIGNAL( accepted( Kopete::Transfer *, const QString& ) ),
 							this, SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const QString& ) ) );
 		QObject::disconnect( Kopete::TransferManager::transferManager(), SIGNAL( refused(const Kopete::FileTransferInfo& ) ),
 						this, SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) );
-	}	
+	}
 }
 
 void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info )
-{		
+{
 	if( !m_pendingFileTransfers.contains( info.internalId() ) )
 		return;
-	
+
 	m_pendingFileTransfers.remove( info.internalId() );
 	m_session->rejectFile( info.contact()->contactId(), info.internalId() );
-	
+
 	if( m_pendingFileTransfers.empty() )
 	{
 		QObject::disconnect( Kopete::TransferManager::transferManager(), SIGNAL( accepted( Kopete::Transfer *, const QString& ) ),
@@ -1416,44 +1571,44 @@ void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info
 
 void YahooAccount::slotFileTransferBytesProcessed( unsigned int transferId, unsigned int bytes )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Transfer: " << transferId << " Bytes:" << bytes << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Transfer: " << transferId << " Bytes:" << bytes << endl;
 	Kopete::Transfer *t = m_fileTransfers[transferId];
 	if( !t )
 		return;
-	
+
 	t->slotProcessed( bytes );
 }
 
 void YahooAccount::slotFileTransferComplete( unsigned int transferId )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	Kopete::Transfer *t = m_fileTransfers[transferId];
 	if( !t )
 		return;
-	
+
 	t->slotComplete();
 	m_fileTransfers.remove( transferId );
 }
 
 void YahooAccount::slotFileTransferError( unsigned int transferId, int error, const QString &desc )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	Kopete::Transfer *t = m_fileTransfers[transferId];
 	if( !t )
 		return;
-	
+
 	t->slotError( error, desc );
 	m_fileTransfers.remove( transferId );
 }
 
 void YahooAccount::slotFileTransferResult( KIO::Job *job )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	const Kopete::Transfer *t = dynamic_cast< const Kopete::Transfer * >( job );
-	
+
 	if( !t )
 		return;
-	
+
 	if( t->error() == KIO::ERR_USER_CANCELED )
 	{
 		m_session->cancelFileTransfer( t->info().transferId() );
@@ -1463,12 +1618,12 @@ void YahooAccount::slotFileTransferResult( KIO::Job *job )
 
 void YahooAccount::slotContactAdded( const QString & /* myid */, const QString & /* who */, const QString & /* msg */ )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << myid << " " << who << " " << msg << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) << myid << " " << who << " " << msg;
 }
 
 void YahooAccount::slotRejected( const QString & /* who */, const QString & /* msg */ )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) ;
 }
 
 void YahooAccount::slotTypingNotify( const QString &who, int what )
@@ -1478,53 +1633,56 @@ void YahooAccount::slotTypingNotify( const QString &who, int what )
 
 void YahooAccount::slotGameNotify( const QString & /* who */, int /* stat */ )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) ;
 }
 
-void YahooAccount::slotMailNotify( const QString& from, const QString& /* subject */, int cnt )
+void YahooAccount::slotMailNotify( const QString& from, const QString&  subject , int cnt )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Mail count: " << cnt << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Mail count: " << cnt << endl;
 
-	if ( cnt > m_currentMailCount && from.isEmpty() )
+	if ( cnt > 0 && from.isEmpty() )
 	{
-		QObject::connect(KNotification::event( "yahoo_mail", i18n( "You have one unread message in your Yahoo inbox.",
-			"You have %n unread messages in your Yahoo inbox.", cnt ), 0 , 0 , i18n( "Open Inbox..." ) ),
-		                 SIGNAL(activated(unsigned int ) ) , this, SLOT( slotOpenInbox() ) );
+		QObject::connect(KNotification::event( QString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.",
+			"You have %n unread messages in your Yahoo inbox.", cnt ), QPixmap() , 0 ),
+			SIGNAL(activated(unsigned int ) ) , this, SLOT( slotOpenInbox() ) );
+
 		m_currentMailCount = cnt;
 	}
-	else if ( cnt > m_currentMailCount )
-	{	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "attempting to trigger event" << endl;
-		QObject::connect(KNotification::event( "yahoo_mail", i18n( "You have a message from %1 in your Yahoo inbox.").arg(from) 
-			, 0 , 0 , i18n( "Open Inbox..." ) ), SIGNAL(activated(unsigned int ) ) , this, SLOT( slotOpenInbox() ) );
+	else if ( cnt > 0 )
+	{	kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl;
+
+		QObject::connect(KNotification::event( QString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").arg( from ).arg( subject ),
+			QPixmap() , 0 ), SIGNAL(activated(unsigned int ) ) , this, SLOT( slotOpenInbox() ) );
+
 		m_currentMailCount = cnt;
 	}
 }
 
 void YahooAccount::slotSystemMessage( const QString & /* msg */ )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << msg << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) << msg;
 }
 
 void YahooAccount::slotRemoveHandler( int /* fd */ )
 {
-//	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+//	kdDebug(YAHOO_GEN_DEBUG) ;
 }
 
 void YahooAccount::slotGotWebcamInvite( const QString& who )
 {
 	YahooContact* kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
-	
+
 	if( m_pendingWebcamInvites.contains( who ) )
 		return;
-	
+
 	m_pendingWebcamInvites.append( who );
-	
-	if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?")
-							.arg(who), QString::null, i18n("Accept"), i18n("Ignore") ) )
+
+	if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ),
+                            QString(), i18n("Accept"), i18n("Ignore") ) )
 	{
 		m_pendingWebcamInvites.remove( who );
 		m_session->requestWebcam( who );
@@ -1532,42 +1690,42 @@ void YahooAccount::slotGotWebcamInvite( const QString& who )
 }
 void YahooAccount::slotWebcamNotAvailable( const QString &who )
 {
-	KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) );
+	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) );
 }
 
 void YahooAccount::slotGotWebcamImage( const QString& who, const QPixmap& image )
 {
 	YahooContact* kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 	kc->receivedWebcamImage( image );
 }
 
-void YahooAccount::slotPictureStatusNotiy( const QString &who, int status)
+void YahooAccount::slotPictureStatusNotify( const QString &who, int status)
 {
 	YahooContact *kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
-	
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " changed picture status to" << status << endl;
+
+	kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " changed picture status to" << status << endl;
 }
 
 void YahooAccount::slotGotBuddyIconChecksum(const QString &who, int checksum)
 {
 	YahooContact *kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 
 	if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() &&
 	     QFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(QRegExp("[./~]"),"-")  +".png" ) ) )
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Icon already exists. I will not request it again." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not request it again." << endl;
 		return;
 	} else
 		m_session->requestPicture( who );
@@ -1575,57 +1733,51 @@ void YahooAccount::slotGotBuddyIconChecksum(const QString &who, int checksum)
 
 void YahooAccount::slotGotBuddyIconInfo(const QString &who, KURL url, int checksum)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	YahooContact *kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 
 	if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()  &&
 	     QFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(QRegExp("[./~]"),"-")  +".png" ) ))
 	{
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Icon already exists. I will not download it again." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not download it again." << endl;
 		return;
 	} else
 		m_session->downloadPicture( who, url, checksum );
 }
 
-void YahooAccount::slotGotBuddyIcon( const QString &who, KTempFile *file, int checksum )
+void YahooAccount::slotGotBuddyIcon( const QString &who, const QByteArray &data, int checksum )
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	YahooContact *kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
-	kc->setDisplayPicture( file, checksum );
+	kc->setDisplayPicture( data, checksum );
 }
 void YahooAccount::slotGotBuddyIconRequest( const QString & who )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	YahooContact *kc = contact( who );
-	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
-		return;
-	}
-	kc->sendBuddyIconInfo( myself()->property( YahooProtocol::protocol()->iconRemoteUrl ).value().toString(),
-							myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() );
+	kdDebug(YAHOO_GEN_DEBUG) ;
+	m_session->sendPictureInformation( who, myself()->property( YahooProtocol::protocol()->iconRemoteUrl ).value().toString(),
+	                                   myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() );
 }
 
-void YahooAccount::setBuddyIcon( KURL url )
+void YahooAccount::setBuddyIcon( const KURL &url )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "Url: " << url.path() << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "Url: " << url.path() << endl;
 	QString s = url.path();
 	if ( url.path().isEmpty() )
 	{
 		myself()->removeProperty( Kopete::Global::Properties::self()->photo() );
 		myself()->removeProperty( YahooProtocol::protocol()->iconRemoteUrl );
 		myself()->removeProperty( YahooProtocol::protocol()->iconExpire );
-		myself()->removeProperty( YahooProtocol::protocol()->iconCheckSum );
-		m_session->setPictureFlag( 0 );
-		
-		slotBuddyIconChanged( QString::null );
+
+		if ( m_session )
+			m_session->setPictureStatus( Yahoo::NoPicture );
 	}
 	else
 	{
@@ -1634,9 +1786,9 @@ void YahooAccount::setBuddyIcon( KURL url )
 		QFile iconFile( newlocation );
 		QByteArray data;
 		uint expire = myself()->property( YahooProtocol::protocol()->iconExpire ).value().toInt();
-		
+
 		if ( image.isNull() ) {
-			KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n( "<qt>The selected buddy icon could not be opened. <br>Please set a new buddy icon.</qt>" ), i18n( "Yahoo Plugin" ) );
+			KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n( "<qt>The selected buddy icon could not be opened. <br />Please set a new buddy icon.</qt>" ), i18n( "Yahoo Plugin" ) );
 			return;
 		}
 		image = image.smoothScale( 96, 96, QImage::ScaleMin );
@@ -1651,13 +1803,13 @@ void YahooAccount::setBuddyIcon( KURL url )
 
 		if( !image.save( newlocation, "PNG" ) || !iconFile.open(IO_ReadOnly) )
 		{
-			KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n( "An error occurred when trying to change the display picture." ), i18n( "Yahoo Plugin" ) );
+			KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n( "An error occurred when trying to change the display picture." ), i18n( "Yahoo Plugin" ) );
 			return;
 		}
-		
+
 		data = iconFile.readAll();
 		iconFile.close();
-		
+
 		// create checksum - taken from qhash.cpp of qt4
 		const uchar *p = reinterpret_cast<const uchar *>(data.data());
 		int n = data.size();
@@ -1670,59 +1822,53 @@ void YahooAccount::setBuddyIcon( KURL url )
 				checksum ^= g >> 23;
 			checksum &= ~g;
 		}
-		
+
 		myself()->setProperty( Kopete::Global::Properties::self()->photo() , newlocation );
 		configGroup()->writeEntry( "iconLocalUrl", newlocation );
-		
+
 		if ( checksum != static_cast<uint>(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) ||
 		     QDateTime::currentDateTime().toTime_t() > expire )
 		{
 			myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, checksum );
-			myself()->setProperty( YahooProtocol::protocol()->iconExpire , QDateTime::currentDateTime().toTime_t() + 604800 );
 			configGroup()->writeEntry( "iconCheckSum", checksum );
-			configGroup()->writeEntry( "iconExpire", myself()->property( YahooProtocol::protocol()->iconExpire ).value().toInt() );
 			if ( m_session != 0 )
 				m_session->uploadPicture( newlocation );
 		}
 	}
 }
 
-void YahooAccount::slotBuddyIconChanged( const QString &url )
+void YahooAccount::slotBuddyIconChanged( const QString &url, int expires )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	QDictIterator<Kopete::Contact> it( contacts() );
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	int checksum = myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt();
 
-	if ( url.isEmpty() )	// remove pictures from buddie's clients
-	{
-		checksum = 0;	
-		m_session->setPictureFlag( 0 );
-	}
-	else
+	if( !url.isEmpty() )
 	{
 		myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, url );
+		myself()->setProperty( YahooProtocol::protocol()->iconExpire , expires );
 		configGroup()->writeEntry( "iconRemoteUrl", url );
-		m_session->setPictureFlag( 2 );
-		m_session->sendPictureChecksum( checksum, QString::null );
+		configGroup()->writeEntry( "iconExpire", expires );
+		m_session->setPictureStatus( Yahoo::Picture );
+		m_session->sendPictureChecksum( QString(), checksum );
 	}
 }
 
 void YahooAccount::slotWebcamReadyForTransmission()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
+	kdDebug(YAHOO_GEN_DEBUG) ;
 	if( !m_webcam )
 	{
 		m_webcam = new YahooWebcam( this );
 		QObject::connect( m_webcam, SIGNAL(webcamClosing()), this, SLOT(slotOutgoingWebcamClosing()) );
 	}
-	
+
 	m_webcam->startTransmission();
 }
 
 void YahooAccount::slotWebcamStopTransmission()
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	
+	kdDebug(YAHOO_GEN_DEBUG) ;
+
 	if( m_webcam )
 	{
 		m_webcam->stopTransmission();
@@ -1747,7 +1893,7 @@ void YahooAccount::slotWebcamViewerJoined( const QString &viewer )
 void YahooAccount::slotWebcamViewerRequest( const QString &viewer )
 {
 	if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. Grant access?")
-		.arg(viewer), QString::null, i18n("Accept"), i18n("Ignore") ) )	
+		.arg(viewer), QString::null, i18n("Accept"), i18n("Ignore") ) )
 		m_session->grantWebcamAccess( viewer );
 }
 
@@ -1763,7 +1909,7 @@ void YahooAccount::slotWebcamClosed( const QString& who, int reason )
 {
 	YahooContact* kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 	kc->webcamClosed( reason );
@@ -1773,16 +1919,16 @@ void YahooAccount::slotWebcamPaused( const QString &who )
 {
 	YahooContact* kc = contact( who );
 	if ( kc == NULL ) {
-		kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << "contact " << who << " doesn't exist." << endl;
+		kdDebug(YAHOO_GEN_DEBUG) << "contact " << who << " doesn't exist." << endl;
 		return;
 	}
 	kc->webcamPaused();
 }
 
-void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const QString &reason)
+void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus &status, const QString &reason)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && 
+	kdDebug(YAHOO_GEN_DEBUG) ;
+	if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline &&
 	     status.status() != Kopete::OnlineStatus::Offline )
 	{
 		if( !reason.isEmpty() )
@@ -1810,6 +1956,16 @@ void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const Q
 	}
 }
 
+/* FIXME: not ported yet
+void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage)
+{
+	int currentStatus = myself()->onlineStatus().internalStatus();
+	m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(),
+	                         (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
+	myself()->setStatusMessage( statusMessage );
+}
+*/
+
 void YahooAccount::slotOpenInbox()
 {
 	KRun::runURL( KURL( QString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" );
@@ -1825,6 +1981,164 @@ void YahooAccount::slotEditOwnYABEntry()
 	myself()->slotUserInfo();
 }
 
+// FIXME: not ported yet
+void YahooAccount::slotJoinChatRoom()
+{
+}
+/*
+	YahooChatSelectorDialog *chatDialog = new YahooChatSelectorDialog( Kopete::UI::Global::mainWidget() );
+
+	QObject::connect( m_session, SIGNAL(gotYahooChatCategories( const QDomDocument & )), chatDialog,
+					SLOT(slotSetChatCategories( const QDomDocument & )) );
+	QObject::connect( m_session, SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const QDomDocument & )),
+					chatDialog, SLOT(slotSetChatRooms( const Yahoo::ChatCategory &, const QDomDocument & )) );
+	QObject::connect( chatDialog, SIGNAL(chatCategorySelected( const Yahoo::ChatCategory & )),
+					this, SLOT(slotChatCategorySelected( const Yahoo::ChatCategory & ) ) );
+	m_session->getYahooChatCategories();
+
+	if( chatDialog->exec() == QDialog::Accepted )
+	{
+		kdDebug() << chatDialog->selectedRoom().topic << " " << chatDialog->selectedRoom().topic << " " << chatDialog->selectedRoom().id << endl;
+		m_session->joinYahooChatRoom( chatDialog->selectedRoom() );
+	}
+
+	chatDialog->deleteLater();
+}
+*/
+
+void YahooAccount::slotLeavChat()
+{
+	m_chatChatSession = 0;
+	m_session->leaveChat();
+}
+
+void YahooAccount::slotChatCategorySelected( const Yahoo::ChatCategory &category )
+{
+	m_session->getYahooChatRooms( category );
+}
+
+// FIXME: not ported yet
+void YahooAccount::slotChatJoined( int roomId, int categoryId, const QString &comment, const QString &handle )
+{
+}
+/*
+	Kopete::ContactPtrList others;
+	others.append(myself());
+
+	if( !m_chatChatSession )
+	{
+		m_chatChatSession = new YahooChatChatSession( protocol(), myself(), others );
+		QObject::connect( m_chatChatSession, SIGNAL(closing(Kopete::ChatSession *)), this,
+					SLOT(slotLeavChat()) );
+	}
+	m_chatChatSession->removeAllContacts();
+	m_chatChatSession->setHandle( handle );
+	m_chatChatSession->setTopic( handle );
+
+	m_chatChatSession->view( true )->raise( false );
+
+	Kopete::Message msg( myself(), m_chatChatSession->members() );
+	msg.setHtmlBody( i18n("You are now in %1 (%2)", handle, comment) );
+	msg.setDirection( Kopete::Message::Internal );
+
+	m_chatChatSession->appendMessage( msg );
+}
+*/
+
+// FIXME: not ported yet
+void YahooAccount::slotChatBuddyHasJoined( const QString &nick, const QString &handle, bool suppressNotification )
+{
+}
+/*
+	if(!m_chatChatSession)
+		return;
+
+	if( !m_chatChatSession->handle().startsWith( handle ) )
+		return;
+
+	YahooContact *c = contact( nick );
+	if ( !c )
+	{
+		kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << nick << " to chat." << endl;
+// 		addContact( nick, nick, 0, Kopete::Account::Temporary );
+		if( !createChatContact( nick ) )
+			return;
+		c = contact( nick );
+		c->setOnlineStatus( m_protocol->Online );
+	}
+	m_chatChatSession->joined( c, suppressNotification );
+}
+*/
+
+// FIXME: not ported yet
+void YahooAccount::slotChatBuddyHasLeft( const QString &nick, const QString &handle )
+{
+}
+/*
+	kdDebug(YAHOO_GEN_DEBUG) ;
+
+	if(!m_chatChatSession)
+		return;
+
+	if( !m_chatChatSession->handle().startsWith( handle ) )
+		return;
+
+	YahooContact *c = contact( nick );
+	if( !c )
+		return;
+	m_chatChatSession->left( c );
+}
+*/
+
+// FIXME: not ported yet
+void YahooAccount::slotChatMessageReceived( const QString &nick, const QString &message, const QString &handle )
+{
+}
+/*
+	if(!m_chatChatSession)
+		return;
+
+	if( !m_chatChatSession->handle().startsWith( handle ) )
+		return;
+
+	QFont msgFont;
+	QDateTime msgDT;
+	Kopete::ContactPtrList justMe;
+
+	if( !contact( nick ) )
+	{
+		kdDebug(YAHOO_GEN_DEBUG) << "Adding contact " << nick << endl;
+		addContact( nick, nick, 0, Kopete::Account::DontChangeKABC );
+		if( !createChatContact( nick ) )
+			return;
+	}
+	kdDebug(YAHOO_GEN_DEBUG) << "Original message is '" << message << "'" << endl;
+
+	QColor fgColor = getMsgColor( message );
+	msgDT.setTime_t(time(0L));
+
+	QString newMsgText = prepareIncomingMessage( message );
+
+	kdDebug(YAHOO_GEN_DEBUG) << "Message after fixing font tags '" << newMsgText << "'" << endl;
+
+	justMe.append(myself());
+
+	Kopete::Message kmsg( contact(nick), justMe );
+	kmsg.setTimestamp( msgDT );
+	kmsg.setHtmlBody( newMsgText );
+	kmsg.setDirection( Kopete::Message::Inbound );
+
+	kmsg.setForegroundColor( fgColor );
+	m_chatChatSession->appendMessage(kmsg);
+}
+*/
+
+void YahooAccount::sendChatMessage( const Kopete::Message &msg, const QString &handle )
+{
+	m_session->sendYahooChatMessage( YahooContact::prepareMessage( msg.escapedBody() ), handle );
+}
+
+
 #include "yahooaccount.moc"
 
 // vim: set noet ts=4 sts=4 sw=4: