[Xfce4-commits] [xfce/xfce4-panel] 01/01: Make "Automatic" the default selection in the panel config dialog

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit 81bc29e40dc74d1a3dfbb274d63245f292dd3398
Author: Christian Hesse <mail at eworm.de>
Date:   Sun Oct 29 00:40:37 2017 +0200

    Make "Automatic" the default selection in the panel config dialog
    
    If the property is not set in xfconf the panel will behave in automatic
    mode. Reflect this by selecting the corresponding setting in the dialog.
---
 panel/panel-preferences-dialog.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index c787b3f..36324a1 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -492,16 +492,17 @@ panel_preferences_dialog_bindings_update (PanelPreferencesDialog *dialog)
       gtk_list_store_insert_with_values (GTK_LIST_STORE (store), &iter, n++,
                                          OUTPUT_NAME, "Automatic",
                                          OUTPUT_TITLE, _("Automatic"), -1);
-      if (g_strcmp0 (output_name, "Automatic") == 0) {
-        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (object), &iter);
-        output_selected = TRUE;
-        span_monitors_sensitive = TRUE;
-      }
+      if (panel_str_is_empty (output_name) ||
+          g_strcmp0 (output_name, "Automatic") == 0)
+        {
+          gtk_combo_box_set_active_iter (GTK_COMBO_BOX (object), &iter);
+          output_selected = TRUE;
+          span_monitors_sensitive = TRUE;
+        }
       gtk_list_store_insert_with_values (GTK_LIST_STORE (store), &iter, n++,
                                          OUTPUT_NAME, "Primary",
                                          OUTPUT_TITLE, _("Primary"), -1);
-      if (panel_str_is_empty (output_name) ||
-          g_strcmp0 (output_name, "Primary") == 0)
+      if (g_strcmp0 (output_name, "Primary") == 0)
         {
           gtk_combo_box_set_active_iter (GTK_COMBO_BOX (object), &iter);
           output_selected = TRUE;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.