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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Lamarque Souza <lamarque () gmail ! com>
Date:       2011-04-02 22:16:06
Message-ID: 20110402221606.D5612AC8CF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226903 by lvsouza:

Update accounts' status message when NowPlaying plugin changes
the global status message and not only when user manually set
the global status message.

BUG: 155865
FIXED-IN: 4.6.2


 M  +0 -12     kopete/kopetewindow.cpp  
 M  +11 -0     libkopete/kopetestatusmanager.cpp  


--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #1226902:1226903
@@ -1301,18 +1301,6 @@
 // same onlinestatus.  Then update Kopete::Away and the UI.
 void KopeteWindow::setStatusMessage ( const Kopete::StatusMessage& statusMessage )
 {
-	bool changed = false;
-	QList<Kopete::Account*> accountList = Kopete::AccountManager::self()->accounts();
-	foreach ( Kopete::Account *account, accountList )
-	{
-		Kopete::Contact *self = account->myself();
-		bool isInvisible = self && self->onlineStatus().status() == Kopete::OnlineStatus::Invisible;
-		if ( self && account->isConnected() && !isInvisible )
-		{
-			changed = true;
-			account->setOnlineStatus ( self->onlineStatus(), statusMessage );
-		}
-	}
 	Kopete::StatusManager::self()->setGlobalStatusMessage ( statusMessage );
 }
 
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetestatusmanager.cpp #1226902:1226903
@@ -326,6 +326,17 @@
 	config.writeEntry( "GlobalStatusMessage", d->globalStatusMessage.message() );
 	config.sync();
 
+	QList<Kopete::Account*> accountList = Kopete::AccountManager::self()->accounts();
+	foreach ( Kopete::Account *account, accountList )
+	{
+		Kopete::Contact *self = account->myself();
+		bool isInvisible = self && self->onlineStatus().status() == Kopete::OnlineStatus::Invisible;
+		if ( self && account->isConnected() && !isInvisible )
+		{
+			account->setOnlineStatus ( self->onlineStatus(), statusMessage );
+		}
+	}
+
 	emit globalStatusChanged();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]