# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247601340 0
# Node ID 32d2caa6a7772b31fa9f7dc6ff3c41f4408e41ba
# Parent  18a96fe7887046eb6f99986a8b0ef8a81841bcad
Commit the QQ null chat room name crash on the *right* branch.

*** Plucked rev d3a2bc4e480b1ff46d215d1622464bd613a5286d (darkrain42@pidgin.im):
Fix a crash when joining a chat room with NULL name. Closes #7568.

diff -r 18a96fe78870 -r 32d2caa6a777 libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c	Tue Jul 14 17:56:13 2009 +0000
+++ b/libpurple/protocols/qq/group_im.c	Tue Jul 14 19:55:40 2009 +0000
@@ -52,6 +52,7 @@
 	gchar *topic_utf8;
 
 	g_return_val_if_fail(rmd != NULL, NULL);
+	g_return_val_if_fail(rmd->title_utf8, NULL);
 	qd = (qq_data *) gc->proto_data;
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
diff -r 18a96fe78870 -r 32d2caa6a777 libpurple/server.c
--- a/libpurple/server.c	Tue Jul 14 17:56:13 2009 +0000
+++ b/libpurple/server.c	Tue Jul 14 19:55:40 2009 +0000
@@ -862,7 +862,12 @@
 
 	account = purple_connection_get_account(gc);
 
+	g_return_val_if_fail(account != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
 	conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
+	g_return_val_if_fail(conv != NULL, NULL);
+
 	chat = PURPLE_CONV_CHAT(conv);
 
 	if (!g_slist_find(gc->buddy_chats, conv))