Mercurial > pidgin
changeset 1453:ecf700f23852
[gaim-migrate @ 1463]
bugfixes
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Wed, 31 Jan 2001 11:25:18 +0000 |
| parents | 3456fd563e75 |
| children | 637592eb8b24 |
| files | src/conversation.c src/gtkimhtml.c |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Wed Jan 31 09:59:11 2001 +0000 +++ b/src/conversation.c Wed Jan 31 11:25:18 2001 +0000 @@ -1131,15 +1131,14 @@ int gtk_font_options = 0; GString *logstr; + gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_COMMENTS; + if (display_options & OPT_DISP_IGNORE_COLOUR) gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_COLOURS; if (display_options & OPT_DISP_IGNORE_FONTS) gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_FONTS; - gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_COMMENTS; - gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_TITLE; - if (display_options & OPT_DISP_IGNORE_SIZES) gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_SIZES;
--- a/src/gtkimhtml.c Wed Jan 31 09:59:11 2001 +0000 +++ b/src/gtkimhtml.c Wed Jan 31 11:25:18 2001 +0000 @@ -1701,7 +1701,8 @@ { GdkColor c; - gdk_color_parse (color, &c); + if (!gdk_color_parse (color, &c)) + return NULL; return gdk_color_copy (&c); } @@ -2333,8 +2334,13 @@ intag = FALSE; tpos = 0; - if (imhtml->img == NULL) + if (imhtml->img == NULL) { + ws [wpos] = 0; + strcat (ws, copy); + wpos = strlen (ws); + g_free (copy); continue; + } t = tag + strlen ("<IMG"); do {