Mercurial > pidgin.yaz

changeset 9596:7b3212aa698c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10439] Tidy up after some un-prefslashing. Also, I think I forgot to commit gtkprefs.c earlier? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 25 Jul 2004 22:47:11 +0000
parents 7541a9bee2cd
children d6f398e80b32
files src/gtkconv.c src/gtknotify.c src/gtkprefs.c
diffstat 3 files changed, 6 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Sun Jul 25 22:44:44 2004 +0000
+++ b/src/gtkconv.c	Sun Jul 25 22:47:11 2004 +0000
@@ -5027,20 +5027,12 @@
 
 	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 &
--- a/src/gtknotify.c	Sun Jul 25 22:44:44 2004 +0000
+++ b/src/gtknotify.c	Sun Jul 25 22:47:11 2004 +0000
@@ -365,20 +365,12 @@
 
 
 	/* Add the text to the gtkimhtml */
-#if 1 /* PREFSLASH04 */
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors"))
 		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;
-#else
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) {
-		options ^= GTK_IMHTML_NO_COLOURS;
-		options ^= GTK_IMHTML_NO_FONTS;
-		options ^= GTK_IMHTML_NO_SIZES;
-	}
-#endif
 
 	options ^= GTK_IMHTML_NO_COMMENTS;
 	options ^= GTK_IMHTML_NO_TITLE;
--- a/src/gtkprefs.c	Sun Jul 25 22:44:44 2004 +0000
+++ b/src/gtkprefs.c	Sun Jul 25 22:47:11 2004 +0000
@@ -822,7 +822,6 @@
 	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);
@@ -830,10 +829,6 @@
 							"/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"));
 
@@ -1005,7 +1000,6 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	vbox = gaim_gtk_make_frame(ret, _("Conversations"));
 
-#if 1 /* PREFSLASH04 */
 	label = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
 					"/gaim/gtk/conversations/button_type",
 					_("Pictures"), GAIM_BUTTON_IMAGE,
@@ -1015,7 +1009,6 @@
 					NULL);
 	gtk_size_group_add_widget(sg, label);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-#endif /* PREFSLASH04 */
 
 	gaim_gtk_prefs_checkbox(_("Enable \"_slash\" commands"),
 			"/gaim/gtk/conversations/enable_commands", vbox);
@@ -1810,11 +1803,12 @@
 	gaim_gtk_prefs_checkbox(_("_Queue new messages when away"),
 				   "/gaim/gtk/away/queue_messages", vbox);
 
-	vbox = gaim_gtk_make_frame (ret, _("Auto-response"));
-	gaim_gtk_prefs_checkbox(_("_Send auto-response"),
-				  "/core/away/auto_response/enabled", vbox);
-	gaim_gtk_prefs_checkbox(_("_Only send auto-response when idle"),
-				  "/core/away/auto_response/idle_only", vbox);
+	label = gaim_gtk_prefs_dropdown(vbox, _("_Auto-reply:"),
+		GAIM_PREF_STRING, "/core/away/auto_reply",
+		_("Never"), "never",
+		_("Only when away"), "away",
+		_("Only when away and idle"), "awayidle",
+		NULL);
 
 	vbox = gaim_gtk_make_frame (ret, _("Idle"));
 	dd = gaim_gtk_prefs_dropdown(vbox, _("Idle _time reporting:"),
@@ -1874,18 +1868,6 @@
 	return ret;
 }
 
-#if 0
-static GtkWidget *
-protocol_page() {
-	GtkWidget *ret;
-
-	ret = gtk_label_new(NULL);
-	gtk_widget_show(ret);
-
-	return ret;
-}
-#endif
-
 static GtkWidget *plugin_description=NULL, *plugin_details=NULL;
 
 static void prefs_plugin_sel (GtkTreeSelection *sel, GtkTreeModel *model) 
@@ -2750,11 +2732,6 @@
 	/* 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");