# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1182968593 0
# Node ID cf2fbfa205b173ca5e7e50d6c538182b6470edec
# Parent  adcb44a07a2dc68221c4922978481baaf26414bb# Parent  a3469318cf355d616c0d3d55fafccb1597abd6ef
merge of '44c5b35ad7903bcaed23711b5dbf0b7fcb261b47'
     and '45d61331479a783d9d6f26cee95a544336427125'

diff -r adcb44a07a2d -r cf2fbfa205b1 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Jun 27 18:21:02 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Jun 27 18:23:13 2007 +0000
@@ -6205,10 +6205,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);
diff -r adcb44a07a2d -r cf2fbfa205b1 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Wed Jun 27 18:21:02 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed Jun 27 18:23:13 2007 +0000
@@ -1002,11 +1002,12 @@
 		gtk_imhtml_close_tags(imhtml, &iter);
 
 	gtk_imhtml_insert_html_at_iter(imhtml, text, flags, &iter);
-	if (!imhtml->wbfo && !plaintext)
-		gtk_imhtml_close_tags(imhtml, &iter);
 	gtk_text_buffer_move_mark_by_name(imhtml->text_buffer, "insert", &iter);
 	gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(imhtml), gtk_text_buffer_get_insert(imhtml->text_buffer),
 	                             0, FALSE, 0.0, 0.0);
+	if (!imhtml->wbfo && !plaintext)
+		gtk_imhtml_close_tags(imhtml, &iter);
+
 }
 
 static void paste_plaintext_received_cb (GtkClipboard *clipboard, const gchar *text, gpointer data)