gnome-control-center r9189 - trunk/capplets/display

[federico svn gnome org]

Author: federico
Date: Wed Jan  7 23:28:46 2009
New Revision: 9189
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9189&view=rev

Log:
Desensitize the Resolution combo when the output is off

Signed-off-by: Federico Mena Quintero <federico novell com>

Modified:
   trunk/capplets/display/ChangeLog
   trunk/capplets/display/xrandr-capplet.c

Modified: trunk/capplets/display/xrandr-capplet.c
==============================================================================
--- trunk/capplets/display/xrandr-capplet.c	(original)
+++ trunk/capplets/display/xrandr-capplet.c	Wed Jan  7 23:28:46 2009
@@ -513,12 +513,15 @@
 
     clear_combo (app->resolution_combo);
 
-    if (!(modes = get_current_modes (app)))
+    if (!(modes = get_current_modes (app))
+	|| !app->current_output->on)
     {
 	gtk_widget_set_sensitive (app->resolution_combo, FALSE);
 	return;
     }
 
+    g_assert (app->current_output != NULL);
+
     gtk_widget_set_sensitive (app->resolution_combo, TRUE);
 
     best_w = 0;
@@ -541,20 +544,9 @@
 	}
     }
 
-    if (count_active_outputs (app) > 1 || !app->current_output->on)
-	add_key (app->resolution_combo, _("Off"), 0, 0, 0, 0);
-
-    if (!app->current_output->on)
-    {
-	current = "Off";
-    }
-    else
-    {
-	current = idle_free (g_strdup_printf (_("%d x %d"),
-					      app->current_output->width,
-					      app->current_output->height));
-    }
-
+    current = idle_free (g_strdup_printf (_("%d x %d"),
+					  app->current_output->width,
+					  app->current_output->height));
 
     if (!combo_select (app->resolution_combo, current))
     {