From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Mon, 13 Oct 2008 07:55:41 +0000 (+0000)
Subject: empathy_chatroom_manager_remove: when looking for the chatroom to remove check the... 
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b39a30028103a52eb5867c3041c32c4b9efa70fb

empathy_chatroom_manager_remove: when looking for the chatroom to remove check the address first so we are not confuse if the room was invalidated

svn path=/trunk/; revision=1579
---

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 96dd8dd4..3c2eb66b 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -351,7 +351,8 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
 
 		this_chatroom = l->data;
 
-		if (empathy_chatroom_equal (chatroom, this_chatroom)) {
+		if (this_chatroom == chatroom ||
+        empathy_chatroom_equal (chatroom, this_chatroom)) {
         gboolean favorite;
 			priv->chatrooms = g_list_delete_link (priv->chatrooms, l);