# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1247606710 0
# Node ID e574d1858b5ad9f3b9a2004235f02faba3a3473d
# Parent  32d2caa6a7772b31fa9f7dc6ff3c41f4408e41ba# Parent  0a0ece3477af96d0a5fd5edde9a9467d6741a47b
merge of '03e0254c6871c4730755a200d34d4adacdf40c66'
     and 'fe1b9e426c3f6f96ab00db928c3c9249746e5845'

diff -r 0a0ece3477af -r e574d1858b5a libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c	Tue Jul 14 21:23:18 2009 +0000
+++ b/libpurple/protocols/qq/group_im.c	Tue Jul 14 21:25:10 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 0a0ece3477af -r e574d1858b5a libpurple/server.c
--- a/libpurple/server.c	Tue Jul 14 21:23:18 2009 +0000
+++ b/libpurple/server.c	Tue Jul 14 21:25:10 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))