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

List:       kopete-devel
Subject:    Re: [kopete-devel] Small bug in kopete trunk account list
From:       "=?UTF-8?Q?Rafael_Fern=C3=A1ndez_L=C3=B3pez?=" <ereslibre () gmail ! com>
Date:       2006-10-14 15:29:01
Message-ID: 93f85fee0610140829q408fbcc9yd08c70f2d948d919 () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

[Attachment #4 (text/plain)]

I've got it. I changed some code and now it is fixed.

Bye,
Rafael Fernández López.

[Attachment #5 (text/html)]

I've got it. I changed some code and now it is fixed.<br><br>Bye,<br>Rafael Fernández López.<br>

["patch.diff" (text/plain)]

Index: kopete/kopete/config/accounts/kopeteaccountconfig.cpp
===================================================================
--- kopete/kopete/config/accounts/kopeteaccountconfig.cpp	(revisión: 595488)
+++ kopete/kopete/config/accounts/kopeteaccountconfig.cpp	(copia de trabajo)
@@ -266,7 +266,7 @@ void KopeteAccountConfig::slotRemoveAcco
 		i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"),
 		 "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue )
 	{
-		Kopete::AccountManager::self()->removeAccount( i );
+		if ( Kopete::AccountManager::self()->removeAccount( i ) )
 		delete lvi;
 	}
 }
Index: kopete/libkopete/kopeteaccountmanager.h
===================================================================
--- kopete/libkopete/kopeteaccountmanager.h	(revisión: 595229)
+++ kopete/libkopete/kopeteaccountmanager.h	(copia de trabajo)
@@ -88,7 +88,7 @@ public:
 	 *
 	 * This is praticaly called by the account config page when you remove the account.
 	 */
-	void removeAccount( Account *account );
+	bool removeAccount( Account *account );
 
 	/**
 	 * \brief Guess the color for a new account
Index: kopete/libkopete/kopeteaccountmanager.cpp
===================================================================
--- kopete/libkopete/kopeteaccountmanager.cpp	(revisión: 595229)
+++ kopete/libkopete/kopeteaccountmanager.cpp	(copia de trabajo)
@@ -255,10 +255,10 @@ Account * AccountManager::findAccount( c
 	return 0L;
 }
 
-void AccountManager::removeAccount( Account *account )
+bool AccountManager::removeAccount( Account *account )
 {
 	if(!account->removeAccount())
-		return;
+		return false;
 
 	Protocol *protocol = account->protocol();
 
@@ -299,7 +299,7 @@ void AccountManager::removeAccount( Acco
 	foreach( Account *account , d->accounts )
 	{
 		if( account->protocol() == protocol )
-			return;
+			return true;
 	}
 	//there is nomore account from the protocol,  we can unload it
 	
@@ -309,6 +309,8 @@ void AccountManager::removeAccount( Acco
 
 	PluginManager::self()->setPluginEnabled( protocolName, false );
 	PluginManager::self()->unloadPlugin( protocolName );
+
+	return true;
 }
 
 void AccountManager::save()


_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel


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