From: Xavier Claessens <xclaesse@gmail.com>
Date: Fri, 8 Jun 2007 19:31:35 +0000 (+0000)
Subject: Checks if the chatroom has an account and a room. Fixes bug #444135.
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b2fea5050c4b89ec3d9d8589948dd85adc757778

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

diff --git a/ChangeLog b/ChangeLog
index 9ec92383..efc1208c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/libempathy/gossip-chatroom-manager.c b/libempathy/gossip-chatroom-manager.c
index 45b787df..f85d5407 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;
 		}