[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-02-09 5:11:48
Message-ID: 20110209051148.A4A48AC8C0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1219501 by lvsouza:

Applying patch from  Christian Muehlhaeuser to force all accounts to
go online if the Status -> Online menu is clicked. Thanks for the patch.

BUG: 234000


 M  +6 -1      kopete/kopetewindow.cpp  
 M  +1 -1      kopete/kopetewindow.h  
 M  +2 -2      libkopete/kopeteaccountmanager.cpp  
 M  +4 -1      libkopete/kopeteaccountmanager.h  


--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #1219500:1219501
@@ -418,7 +418,7 @@
 	Kopete::StatusRootAction* statusAction = new Kopete::StatusRootAction ( \
d->actionStatusMenu );  
 	connect ( statusAction, SIGNAL ( changeStatus ( uint, const Kopete::StatusMessage& \
                ) ),
-	          Kopete::AccountManager::self(), SLOT ( setOnlineStatus ( uint, const \
Kopete::StatusMessage& ) ) ); +	          this, SLOT ( setOnlineStatus ( uint, const \
Kopete::StatusMessage& ) ) );  connect ( statusAction, SIGNAL ( updateMessage ( \
                Kopete::StatusRootAction* ) ),
 	          this, SLOT ( updateStatusMenuMessage ( Kopete::StatusRootAction* ) ) );
 	connect ( statusAction, SIGNAL ( changeMessage ( const Kopete::StatusMessage& ) ),
@@ -1291,6 +1291,11 @@
 			d->autoResizeTimer->start ( 1000 );
 }
 
+void KopeteWindow::setOnlineStatus( uint category, const Kopete::StatusMessage& \
statusMessage ) +{
+	Kopete::AccountManager::self()->setOnlineStatus( category, statusMessage, 0, true \
); +}
+
 // Iterate each connected account, updating its status message but keeping the
 // same onlinestatus.  Then update Kopete::Away and the UI.
 void KopeteWindow::setStatusMessage ( const Kopete::StatusMessage& statusMessage )
--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.h #1219500:1219501
@@ -74,7 +74,7 @@
 	void slotToggleAway();
 	void slotNewInfoEvent();
 
-
+	void setOnlineStatus( uint, const Kopete::StatusMessage& );
 	void setStatusMessage( const Kopete::StatusMessage& );
 
 	void globalStatusChanged();
--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteaccountmanager.cpp #1219500:1219501
@@ -105,12 +105,12 @@
 	return false;
 }
 
-void AccountManager::setOnlineStatus( uint category, const Kopete::StatusMessage \
&statusMessage, uint flags ) +void AccountManager::setOnlineStatus( uint category, \
const Kopete::StatusMessage &statusMessage, uint flags, bool forced )  {
 	kDebug() << "category: " << category << "status title: " << statusMessage.title() \
<< "status message: " << statusMessage.message();  OnlineStatusManager::Categories \
categories  = (OnlineStatusManager::Categories)category;
-	const bool onlyChangeConnectedAccounts = isAnyAccountConnected();
+	const bool onlyChangeConnectedAccounts = ( !forced && isAnyAccountConnected() );
 
 	foreach( Account *account, d->accounts )
 	{
--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteaccountmanager.h #1219500:1219501
@@ -129,9 +129,12 @@
 	 * @param category is one of the Kopete::OnlineStatusManager::Categories
 	 * @param statusMessage is the new status message
 	 * @param flags is a bitmask of SetOnlineStatusFlag
+	 * @param forced is a boolean indicating that all accounts are required to change \
                status
 	 */
 	void setOnlineStatus( /*Kopete::OnlineStatusManager::Categories*/ uint category,
-	                      const Kopete::StatusMessage &statusMessage = \
Kopete::StatusMessage(), uint flags=0); +	                      const \
Kopete::StatusMessage &statusMessage = Kopete::StatusMessage(), +			      uint flags \
= 0, +			      bool forced = false );
 
 	/**
 	 * @brief Set the given status message for all online accounts


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