Mercurial > pidgin
changeset 16933:9278933225eb
merge of '87f23e108affd467aea07671ede1fdd589b2cc32'
and 'b7e900fdd4234a05a5ce3210c5a3b5cef39d527a'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 08 May 2007 00:43:52 +0000 |
| parents | 3d0aec991e5d (diff) 00c24829e243 (current diff) |
| children | 2fffd9d72b8f |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;