# HG changeset patch # User Mark Doliner # Date 1084685137 0 # Node ID f041cc8d86cf29ed862932d80f09f7bfc81e603a # Parent 48f1b020136b095cf5c3dab18da06b28b6760011 [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 diff -r 48f1b020136b -r f041cc8d86cf src/gaimrc.c --- a/src/gaimrc.c Sun May 16 05:13:12 2004 +0000 +++ b/src/gaimrc.c Sun May 16 05:25:37 2004 +0000 @@ -917,8 +917,6 @@ ? GAIM_BUTTON_IMAGE : GAIM_BUTTON_TEXT_IMAGE) : ((display_options & OPT_DISP_NO_BUTTONS) ? GAIM_BUTTON_NONE : GAIM_BUTTON_TEXT))); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_colors", - display_options & OPT_DISP_IGNORE_COLOUR); gaim_prefs_set_bool("/core/conversations/chat/show_join", display_options & OPT_DISP_CHAT_LOGON); gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type", @@ -935,10 +933,6 @@ ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); gaim_prefs_set_bool("/gaim/gtk/blist/show_warning_level", display_options & OPT_DISP_SHOW_WARN); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_fonts", - display_options & OPT_DISP_IGNORE_FONTS); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_font_sizes", - display_options & OPT_DISP_IGNORE_SIZES); gaim_prefs_set_int("/gaim/gtk/conversations/tab_side", ((display_options & OPT_DISP_CONV_SIDE_TAB) ? ((display_options & OPT_DISP_CONV_BR_TAB) @@ -1000,12 +994,6 @@ convo_options & OPT_CONVO_CTL_ENTER); gaim_prefs_set_bool("/gaim/gtk/conversations/show_timestamps", convo_options & OPT_CONVO_SHOW_TIME); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_colors", - convo_options & OPT_CONVO_IGNORE_COLOUR); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_fonts", - convo_options & OPT_CONVO_IGNORE_FONTS); - gaim_prefs_set_bool("/gaim/gtk/conversations/ignore_font_sizes", - convo_options & OPT_CONVO_IGNORE_SIZES); gaim_prefs_set_bool("/core/conversations/combine_chat_im", convo_options & OPT_CONVO_COMBINE); gaim_prefs_set_bool("/gaim/gtk/conversations/close_on_tabs", diff -r 48f1b020136b -r f041cc8d86cf src/gtkconv.c --- 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); diff -r 48f1b020136b -r f041cc8d86cf src/gtknotify.c --- a/src/gtknotify.c Sun May 16 05:13:12 2004 +0000 +++ b/src/gtknotify.c Sun May 16 05:25:37 2004 +0000 @@ -365,14 +365,11 @@ /* Add the text to the gtkimhtml */ - if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors")) + if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) { options ^= GTK_IMHTML_NO_COLOURS; - - if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts")) options ^= GTK_IMHTML_NO_FONTS; - - if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes")) options ^= GTK_IMHTML_NO_SIZES; + } options ^= GTK_IMHTML_NO_COMMENTS; options ^= GTK_IMHTML_NO_TITLE; diff -r 48f1b020136b -r f041cc8d86cf src/gtkprefs.c --- a/src/gtkprefs.c Sun May 16 05:13:12 2004 +0000 +++ b/src/gtkprefs.c Sun May 16 05:25:37 2004 +0000 @@ -798,16 +798,8 @@ gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), "/gaim/gtk/conversations/spellcheck", vbox); #endif -#if 0 /* PREFSLASH04 */ - vbox = gaim_gtk_make_frame (ret, _("Ignore")); - gaim_gtk_prefs_checkbox(_("Ignore c_olors"), - "/gaim/gtk/conversations/ignore_colors", vbox); - gaim_gtk_prefs_checkbox(_("Ignore font _faces"), - "/gaim/gtk/conversations/ignore_fonts", vbox); - gaim_gtk_prefs_checkbox(_("Ignore font si_zes"), - "/gaim/gtk/conversations/ignore_font_sizes", vbox); -#endif /* PREFSLASH04 */ - gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), NULL, vbox); + gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), + "/gaim/gtk/conversations/ignore_formatting", vbox); gtk_widget_show_all(ret); return ret; } @@ -2949,6 +2941,9 @@ "/gaim/gtk/sound/signon"); /* Remove some no-longer-used prefs */ + gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); + gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts"); + gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes"); gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links"); gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");