# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1255623180 0
# Node ID ef513141e960d88a0e0cb9524cc109015fe465ce
# Parent  5550823608cbf64c955d763faa9447a1eb35c250
jabber: Reduce these from assertions to checks.

Both of those are triggered by double-clicking on an already-open chat in
the buddy list, so they shouldn't be assertions.

diff -r 5550823608cb -r ef513141e960 libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Tue Oct 13 19:52:35 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Thu Oct 15 16:13:00 2009 +0000
@@ -216,7 +216,8 @@
 	JabberChat *chat;
 	char *jid;
 
-	g_return_val_if_fail(jabber_chat_find(js, room, server) == NULL, NULL);
+	if (jabber_chat_find(js, room, server) != NULL)
+		return NULL;
 
 	chat = g_new0(JabberChat, 1);
 	chat->js = js;
@@ -264,7 +265,8 @@
 	char *jid;
 
 	chat = jabber_chat_new(js, room, server, handle, password, data);
-	g_return_val_if_fail(chat != NULL, NULL);
+	if (chat == NULL)
+		return NULL;
 
 	gc = js->gc;
 	account = purple_connection_get_account(gc);