[Xfce4-commits] <xfce4-settings:master> Allow disabling outputs only with randr >= 1.2.

[Nick Schermer]

Updating branch refs/heads/master
         to e5d3fcb1012db543836ec6a0a41b8b75192b9c4f (commit)
       from e4ff701cb36e44d94a442cc84214e58b1439349f (commit)

commit e5d3fcb1012db543836ec6a0a41b8b75192b9c4f
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date:   Sat Jun 5 17:34:50 2010 +0200

    Allow disabling outputs only with randr >= 1.2.

 dialogs/display-settings/main.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index a3d1d53..d374866 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -374,15 +374,16 @@ display_setting_resolutions_populate (GtkBuilder *builder)
     combobox = gtk_builder_get_object (builder, "randr-resolution");
     model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
     gtk_list_store_clear (GTK_LIST_STORE (model));
-    /* entry for a disabled output */
-    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                        COLUMN_COMBO_NAME, _("None (disabled)"),
-                        COLUMN_COMBO_VALUE, None, -1);
 
 #ifdef HAS_RANDR_ONE_POINT_TWO
     if (xfce_randr)
     {
+        /* entry for a disabled output */
+        gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                            COLUMN_COMBO_NAME, _("None (disabled)"),
+                            COLUMN_COMBO_VALUE, None, -1);
+
         if (XFCE_RANDR_MODE (xfce_randr) == None)
             gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);