# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1178585032 0
# Node ID 9278933225eb69f409fc8f2f227b66e5b947f114
# Parent  3d0aec991e5d6c77e24d8e299d6bc313c0de57b3# Parent  00c24829e24313b9634db9ea5279ee9ed17fb985
merge of '87f23e108affd467aea07671ede1fdd589b2cc32'
     and 'b7e900fdd4234a05a5ce3210c5a3b5cef39d527a'

diff -r 00c24829e243 -r 9278933225eb libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Tue May 08 00:35:34 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Tue May 08 00:43:52 2007 +0000
@@ -398,7 +398,7 @@
 					*(p+1) == '<')) {
 				bold_count++;
 				in_bold = FALSE;
-			} else if (preceding_space && !in_bold) {
+			} else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
 				bold_count++;
 				in_bold = TRUE;
 			}
@@ -409,7 +409,7 @@
 					*(p+1) == '<')) {
 				italic_count++;
 				in_italic = FALSE;
-			} else if (preceding_space && !in_italic) {
+			} else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
 				italic_count++;
 				in_italic = TRUE;
 			}
@@ -445,7 +445,7 @@
 				str = g_string_append(str, "</b>");
 				in_bold = FALSE;
 				bold_count--;
-			} else if (preceding_space && bold_count > 1) {
+			} else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
 				str = g_string_append(str, "<b>");
 				bold_count--;
 				in_bold = TRUE;
@@ -459,7 +459,7 @@
 				str = g_string_append(str, "</i>");
 				italic_count--;
 				in_italic = FALSE;
-			} else if (preceding_space && italic_count > 1) {
+			} else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
 				str = g_string_append(str, "<i>");
 				italic_count--;
 				in_italic = TRUE;