Mercurial > pidgin
diff src/gtkconv.c @ 9596:7b3212aa698c
[gaim-migrate @ 10439]
Tidy up after some un-prefslashing. Also, I think I forgot to commit
gtkprefs.c earlier?
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 25 Jul 2004 22:47:11 +0000 |
| parents | bb722a784568 |
| children | d6f398e80b32 |
line wrap: on
line diff
--- a/src/gtkconv.c Sun Jul 25 22:44:44 2004 +0000 +++ b/src/gtkconv.c Sun Jul 25 22:47:11 2004 +0000 @@ -5027,20 +5027,12 @@ gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; -#if 1 /* PREFSLASH04 */ if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors")) gtk_font_options ^= GTK_IMHTML_NO_COLOURS; if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts")) gtk_font_options ^= GTK_IMHTML_NO_FONTS; if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes")) gtk_font_options ^= GTK_IMHTML_NO_SIZES; -#else - if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) { - gtk_font_options ^= GTK_IMHTML_NO_COLOURS; - gtk_font_options ^= GTK_IMHTML_NO_FONTS; - gtk_font_options ^= GTK_IMHTML_NO_SIZES; - } -#endif /* this is gonna crash one day, I can feel it. */ if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options &