empathy r1579 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Oct 13 07:55:41 2008
New Revision: 1579
URL: http://svn.gnome.org/viewvc/empathy?rev=1579&view=rev

Log:
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

Modified:
   trunk/libempathy/empathy-chatroom-manager.c

Modified: trunk/libempathy/empathy-chatroom-manager.c
==============================================================================
--- trunk/libempathy/empathy-chatroom-manager.c	(original)
+++ trunk/libempathy/empathy-chatroom-manager.c	Mon Oct 13 07:55:41 2008
@@ -351,7 +351,8 @@
 
 		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);