Mercurial > pidgin
diff src/gtkconv.c @ 9049:f01eef2c264a
[gaim-migrate @ 9825]
Split Ignore Formatting into Ignore Font, Ignore Colors and whatever else.
Is that cool? I was never really comfortable with removing this in the
first place. Someone should test this.
G'night.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 24 May 2004 04:29:40 +0000 |
| parents | f2f8a56acdb6 |
| children | 717d0e23f5fa |
line wrap: on
line diff
--- a/src/gtkconv.c Mon May 24 00:46:12 2004 +0000 +++ b/src/gtkconv.c Mon May 24 04:29:40 2004 +0000 @@ -4587,11 +4587,20 @@ 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 & @@ -5784,7 +5793,13 @@ gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE); gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE); +#if 1 + gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_colors", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_fonts", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_font_sizes", FALSE); +#else gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_formatting", FALSE); +#endif gaim_prefs_add_bool("/gaim/gtk/conversations/html_shortcuts", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/smiley_shortcuts", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);