aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-chatroom-manager.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-10-13 15:55:41 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-10-13 15:55:41 +0800
commitb39a30028103a52eb5867c3041c32c4b9efa70fb (patch)
treeee279ef27897f7aa98ea90728b04fa38bc54363e /libempathy/empathy-chatroom-manager.c
parent4ed2c2b212ed2298c6dc3c3ed4d1ea7565d48b0d (diff)
downloadgsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar.gz
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar.bz2
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar.lz
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar.xz
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.tar.zst
gsoc2013-empathy-b39a30028103a52eb5867c3041c32c4b9efa70fb.zip
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
Diffstat (limited to 'libempathy/empathy-chatroom-manager.c')
-rw-r--r--libempathy/empathy-chatroom-manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 96dd8dd4c..3c2eb66bb 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);