From bfe8e39c47e592cb857dd637b625945af118ce49 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Thu, 19 Jul 2001 17:43:20 +0000 Subject: [PATCH] Remove references to auto apply feature 2001-07-19 Bradford Hovinen * prefs-widget.c: Remove references to auto apply feature * applier.c (get_geometry): Use vwidth and vheight rather than dwidth and dheight when computing aspect ratio (get_geometry): Adjust rwidth and rheight according to above change * preferences.c (preferences_changed): Disable auto-apply * background-properties.glade: Remove apply automatically check button; change "More Solid" to "More Opaque" --- capplets/background/ChangeLog | 2 ++ capplets/background/prefs-widget.c | 26 -------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index cbfe6ca20..e408a9221 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,5 +1,7 @@ 2001-07-19 Bradford Hovinen + * prefs-widget.c: Remove references to auto apply feature + * applier.c (get_geometry): Use vwidth and vheight rather than dwidth and dheight when computing aspect ratio (get_geometry): Adjust rwidth and rheight according to above change diff --git a/capplets/background/prefs-widget.c b/capplets/background/prefs-widget.c index c00e986ba..fea2c39b3 100644 --- a/capplets/background/prefs-widget.c +++ b/capplets/background/prefs-widget.c @@ -157,10 +157,6 @@ prefs_widget_init (PrefsWidget *prefs_widget) "browse_button_cb", browse_button_cb, prefs_widget); - glade_xml_signal_connect_data (prefs_widget->dialog_data, - "auto_apply_toggled_cb", - auto_apply_toggled_cb, - prefs_widget); glade_xml_signal_connect_data (prefs_widget->dialog_data, "adjust_opacity_toggled_cb", adjust_opacity_toggled_cb, @@ -395,10 +391,6 @@ read_preferences (PrefsWidget *prefs_widget, Preferences *prefs) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("disable_toggle")), prefs->enabled); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON - (WID ("auto_apply")), - prefs->auto_apply); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("adjust_opacity_toggle")), prefs->adjust_opacity); @@ -469,7 +461,6 @@ set_background_controls_sensitive (PrefsWidget *prefs_widget, gboolean s) gtk_widget_set_sensitive (WID ("adjust_opacity_toggle"), s); gtk_widget_set_sensitive (WID ("opacity_box"), s && prefs_widget->prefs->adjust_opacity); - gtk_widget_set_sensitive (WID ("auto_apply"), s); } @@ -704,23 +695,6 @@ wp_selection_cancel_cb (GtkButton *button, PrefsWidget *prefs_widget) gtk_widget_hide (prefs_widget->filesel); } -static void -auto_apply_toggled_cb (GtkToggleButton *tb, PrefsWidget *prefs_widget) -{ - g_return_if_fail (prefs_widget != NULL); - g_return_if_fail (IS_PREFS_WIDGET (prefs_widget)); - g_return_if_fail (prefs_widget->prefs != NULL); - g_return_if_fail (IS_PREFERENCES (prefs_widget->prefs)); - - if (gtk_toggle_button_get_active (tb)) - prefs_widget->prefs->auto_apply = TRUE; - else - prefs_widget->prefs->auto_apply = FALSE; - - preferences_changed (prefs_widget->prefs); - capplet_widget_state_changed (CAPPLET_WIDGET (prefs_widget), TRUE); -} - static void adjust_opacity_toggled_cb (GtkToggleButton *tb, PrefsWidget *prefs_widget) {