# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 964468234 0
# Node ID fd6a3294366fc1604f72180471e279021c441c64
# Parent  926ba0807a2dea0412fa85525f8e5915eebbcb60
[gaim-migrate @ 530]
Should fix problem with smileys causing resize to lose <BR>

committer: Tailor Script <tailor@pidgin.im>

diff -r 926ba0807a2d -r fd6a3294366f src/conversation.c
--- a/src/conversation.c	Fri Jul 21 20:03:12 2000 +0000
+++ b/src/conversation.c	Mon Jul 24 19:50:34 2000 +0000
@@ -975,6 +975,7 @@
 	int y;
 	int i;
 	char *smiley = g_malloc(7);
+	gboolean add_space = FALSE;
 
 	if (!who) {
 		if (flags & WFLAG_SEND)
@@ -1068,9 +1069,11 @@
 					gtk_html_add_pixmap(GTK_HTML(c->text), face, 0);
 					y = 0;
 					i += len - 1;
+					add_space = TRUE;
 				} else {
 	               			buf2[y] = what[i];
 	               			y++;
+					add_space = FALSE;
 
 				}
         		}
@@ -1079,7 +1082,10 @@
 			{
 				buf2[y] = 0;
 				gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
+				add_space = FALSE;
 			}				
+			if (add_space)
+				gtk_html_append_text(GTK_HTML(c->text), " ", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
 		}
 		else
 		{