diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libempathy/gossip-chatroom-manager.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2007-06-08 Xavier Claessens <xclaesse@gmail.com> + * libempathy/gossip-chatroom-manager.c: Checks if the chatroom has + an account and a room. Fixes bug #444135. + +2007-06-08 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-contact-dialogs.c: * libempathy-gtk/empathy-contact-widget.c: * libempathy-gtk/empathy-contact-widget.h: Do not save when closing the 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; } |