From b2fea5050c4b89ec3d9d8589948dd85adc757778 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 8 Jun 2007 19:31:35 +0000 Subject: Checks if the chatroom has an account and a room. Fixes bug #444135. 2007-06-08 Xavier Claessens * libempathy/gossip-chatroom-manager.c: Checks if the chatroom has an account and a room. Fixes bug #444135. svn path=/trunk/; revision=133 --- ChangeLog | 5 +++++ libempathy/gossip-chatroom-manager.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9ec92383d..efc1208c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-08 Xavier Claessens + + * libempathy/gossip-chatroom-manager.c: Checks if the chatroom has + an account and a room. Fixes bug #444135. + 2007-06-08 Xavier Claessens * libempathy-gtk/empathy-contact-dialogs.c: diff --git a/libempathy/gossip-chatroom-manager.c b/libempathy/gossip-chatroom-manager.c index 45b787df5..f85d5407e 100644 --- a/libempathy/gossip-chatroom-manager.c +++ b/libempathy/gossip-chatroom-manager.c @@ -229,7 +229,8 @@ gossip_chatroom_manager_find (GossipChatroomManager *manager, this_account = gossip_chatroom_get_account (chatroom); this_room = gossip_chatroom_get_room (chatroom); - if (gossip_account_equal (account, this_account) && + if (this_account && this_room && + gossip_account_equal (account, this_account) && strcmp (this_room, room) == 0) { return chatroom; } -- cgit v1.2.3