# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1182960829 0
# Node ID 2e7a9f33cfd3e6d95d48001c166609bc726ddf71
# Parent  c0e14bceee662f4f75ecae27d51b02376f65664d
Handle NULL chat topics

diff -r c0e14bceee66 -r 2e7a9f33cfd3 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Jun 26 21:47:20 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Jun 27 16:13:49 2007 +0000
@@ -6192,10 +6192,11 @@
 				markup = title;
 		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 			PurpleConvChat *chat = PURPLE_CONV_CHAT(conv);
-			markup = g_strdup_printf("%s\n<span color='%s' size='smaller'>%s</span>",
+			const char *topic = purple_conv_chat_get_topic(chat);
+			markup = g_strdup_printf("%s%s<span color='%s' size='smaller'>%s</span>",
 						purple_conversation_get_title(conv),
 						pidgin_get_dim_grey_string(gtkconv->infopane),
-						purple_conv_chat_get_topic(chat));
+						topic ? "\n" : "", topic ? topic : "");
 		}
 		gtk_list_store_set(gtkconv->infopane_model, &(gtkconv->infopane_iter),
 				TEXT_COLUMN, markup, -1);