diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-06-09 03:31:35 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-06-09 03:31:35 +0800 |
| commit | b2fea5050c4b89ec3d9d8589948dd85adc757778 (patch) | |
| tree | e3ea4bd66c4200323ad41743946d608e18c90d13 | |
| parent | db7cecd7653d88081ea9c89ac7e68b0816961189 (diff) | |
| download | gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar.gz gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar.bz2 gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar.lz gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar.xz gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.tar.zst gsoc2013-empathy-b2fea5050c4b89ec3d9d8589948dd85adc757778.zip | |
Checks if the chatroom has an account and a room. Fixes bug #444135.
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.
svn path=/trunk/; revision=133
| -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; } |