Mercurial > pidgin
comparison src/gtkprefs.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 | 48f1b020136b |
children | 6d7b403b11bb |
comparison
equal
deleted
inserted
replaced
8943:48f1b020136b | 8944:f041cc8d86cf |
---|---|
796 "/gaim/gtk/conversations/show_timestamps", vbox); | 796 "/gaim/gtk/conversations/show_timestamps", vbox); |
797 #ifdef USE_GTKSPELL | 797 #ifdef USE_GTKSPELL |
798 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), | 798 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), |
799 "/gaim/gtk/conversations/spellcheck", vbox); | 799 "/gaim/gtk/conversations/spellcheck", vbox); |
800 #endif | 800 #endif |
801 #if 0 /* PREFSLASH04 */ | 801 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), |
802 vbox = gaim_gtk_make_frame (ret, _("Ignore")); | 802 "/gaim/gtk/conversations/ignore_formatting", vbox); |
803 gaim_gtk_prefs_checkbox(_("Ignore c_olors"), | |
804 "/gaim/gtk/conversations/ignore_colors", vbox); | |
805 gaim_gtk_prefs_checkbox(_("Ignore font _faces"), | |
806 "/gaim/gtk/conversations/ignore_fonts", vbox); | |
807 gaim_gtk_prefs_checkbox(_("Ignore font si_zes"), | |
808 "/gaim/gtk/conversations/ignore_font_sizes", vbox); | |
809 #endif /* PREFSLASH04 */ | |
810 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), NULL, vbox); | |
811 gtk_widget_show_all(ret); | 803 gtk_widget_show_all(ret); |
812 return ret; | 804 return ret; |
813 } | 805 } |
814 | 806 |
815 GtkWidget *hotkeys_page() { | 807 GtkWidget *hotkeys_page() { |
2947 "/gaim/gtk/conversations/placement"); | 2939 "/gaim/gtk/conversations/placement"); |
2948 gaim_prefs_rename_boolean_toggle("/gaim/gtk/sound/silent_signon", | 2940 gaim_prefs_rename_boolean_toggle("/gaim/gtk/sound/silent_signon", |
2949 "/gaim/gtk/sound/signon"); | 2941 "/gaim/gtk/sound/signon"); |
2950 | 2942 |
2951 /* Remove some no-longer-used prefs */ | 2943 /* Remove some no-longer-used prefs */ |
2944 gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); | |
2945 gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts"); | |
2946 gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes"); | |
2952 gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links"); | 2947 gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links"); |
2953 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); | 2948 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); |
2954 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); | 2949 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); |
2955 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); | 2950 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); |
2956 } | 2951 } |