Mercurial > pidgin3 / file diff

--- a/src/gtkprefs.c	Mon May 24 00:46:12 2004 +0000
+++ b/src/gtkprefs.c	Mon May 24 04:29:40 2004 +0000
@@ -779,8 +779,18 @@
 	gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"),
 			"/gaim/gtk/conversations/spellcheck", vbox);
 #endif
+#if 1 /* 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);
+#else
 	gaim_gtk_prefs_checkbox(_("_Ignore formatting on incoming messages"),
 			"/gaim/gtk/conversations/ignore_formatting", vbox);
+#endif
 
 	vbox = gaim_gtk_make_frame (ret, _("Default Formatting"));
 
@@ -2830,9 +2840,11 @@
 	/* Remove some no-longer-used prefs */
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
 	gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
+#if 0 /* PREFSLASH04 */
 	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");
+#endif
 	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");