Mercurial > pidgin
diff src/gtkconv.c @ 8944:f041cc8d86cf
[gaim-migrate @ 9716]
Fully replace Ignore colors, Ignore font faces and Ignore font sizes with
Ignore formatting on incoming messages.
nosnilmot: I chose not to apply your change to set_away_option because
people should not attempt to set a preference with a NULL value, and
if they do we might as well just have Gaim crash so they know about it.
My reasoning might be flawed. Eh.
Also, Chip and Etan were both against consolidating these options,
so someone might want to keep a patch of this commit handy so we can
revert it, if necessary.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 16 May 2004 05:25:37 +0000 |
| parents | 71fddf3f340d |
| children | 80944edf8d80 |
line wrap: on
line diff
--- a/src/gtkconv.c Sun May 16 05:13:12 2004 +0000 +++ b/src/gtkconv.c Sun May 16 05:25:37 2004 +0000 @@ -4575,14 +4575,11 @@ gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; - if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors")) + if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) { 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; + } /* 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 & @@ -5852,9 +5849,7 @@ 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); - 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); + gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_formatting", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_bgcolor", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_fgcolor", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_font", FALSE);