[Xfce4-commits] <xfdesktop:master> Use the right icon style in the desktop settings by default(bug #6798).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 22bcf8081c01f922a7b12d9f4e33af77a73019b4 (commit)
       from 69c683b72744926a734c77dbbc055ea856fc1c41 (commit)

commit 22bcf8081c01f922a7b12d9f4e33af77a73019b4
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Nov 13 13:30:07 2010 +0100

    Use the right icon style in the desktop settings by default(bug #6798).
    
    When running xfdesktop for the first time, the /desktop-icons/style will
    be undefined. This caused the desktop settings dialog to always show
    'None' as the icon style even though xfdesktop uses file icons / window
    icons by default (depending on whether file icons are built in). So we
    now follow that behaviour in the desktop settings dialog.

 NEWS            |    2 ++
 settings/main.c |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 3ba1e4e..70bdbd9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Xfdesktop 4.7.x
 
   * Fix a crash caused by accessing the wrong variable when adding
     items to the right-click menu.
+  * Select the correct icon style in the desktop settings on first 
+    start (bug #6798).
 
 
 Xfdesktop 4.7.2
diff --git a/settings/main.c b/settings/main.c
index c1c4333..06edc9b 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1452,7 +1452,11 @@ xfdesktop_settings_dialog_new(GtkBuilder *main_gxml,
                            "active");
 
     w = GTK_WIDGET(gtk_builder_get_object(main_gxml, "combo_icons"));
-    gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0);
+#ifdef ENABLE_FILE_ICONS
+    gtk_combo_box_set_active(GTK_COMBO_BOX(w), 2);
+#else
+    gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1);
+#endif
     xfconf_g_property_bind(channel, DESKTOP_ICONS_STYLE_PROP, G_TYPE_INT,
                            G_OBJECT(w), "active");
     xfconf_g_property_bind(channel, DESKTOP_ICONS_ICON_SIZE_PROP, G_TYPE_UINT,