# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1161303581 0
# Node ID 584da235633edd9db9f65b07932a076f7f534a7f
# Parent  6d0ca3a1d4642cb9655cbd049b340cd4bc5db0ac
[gaim-migrate @ 17551]
Do not print an extra newline for HTML logs.

(20:17:27) seanegan: sadrul: are you checking the flags from gaim_log_read?
(20:18:18) elb: sadrul: for HTML logs, it should strip 0x0a and turn <br> into 0x0a

committer: Tailor Script <tailor@pidgin.im>

diff -r 6d0ca3a1d464 -r 584da235633e console/plugins/gnthistory.c
--- a/console/plugins/gnthistory.c	Thu Oct 19 22:17:30 2006 +0000
+++ b/console/plugins/gnthistory.c	Fri Oct 20 00:19:41 2006 +0000
@@ -45,7 +45,7 @@
 	GaimConversationType convtype;
 	GList *logs = NULL;
 	const char *alias = name;
-	guint flags;
+	GaimLogReadFlags flags;
 	char *history;
 	char *header;
 	GaimMessageFlags mflag;
@@ -119,7 +119,8 @@
 	gaim_conversation_write(c, "", header, mflag, time(NULL));
 	g_free(header);
 
-	g_strchomp(history);
+	if (flags & GAIM_LOG_READ_NO_NEWLINE)
+		gaim_str_strip_char(history, '\n');
 	gaim_conversation_write(c, "", history, mflag, time(NULL));
 	g_free(history);