[Xfce4-commits] r29642 - in xfce4-settings/trunk: . dialogs/appearance-settings

[Nick Schermer]

Author: nick
Date: 2009-03-03 17:43:56 +0000 (Tue, 03 Mar 2009)
New Revision: 29642

Modified:
   xfce4-settings/trunk/NEWS
   xfce4-settings/trunk/dialogs/appearance-settings/main.c
Log:
Use the folder name for selecting the icon- and style-theme in the
appearance dialog (bug #4997).


Modified: xfce4-settings/trunk/NEWS
===================================================================
--- xfce4-settings/trunk/NEWS	2009-03-02 23:18:41 UTC (rev 29641)
+++ xfce4-settings/trunk/NEWS	2009-03-03 17:43:56 UTC (rev 29642)
@@ -1,3 +1,8 @@
+4.6.1
+=====
+- Use the folder name for selecting the icon- and style-theme in the
+  appearance dialog (bug #4997).
+
 4.6.0
 =====
 - Make the Xrandr dependency optional. If Xrandr is disabled, the

Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c	2009-03-02 23:18:41 UTC (rev 29641)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c	2009-03-03 17:43:56 UTC (rev 29642)
@@ -344,7 +344,7 @@
                     g_free (comment_escaped);
 
                     /* Check if this is the active theme, if so, select it */
-                    if (G_UNLIKELY (g_utf8_collate (theme_name, active_theme_name) == 0))
+                    if (G_UNLIKELY (g_utf8_collate (file, active_theme_name) == 0))
                     {
                         tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
                         gtk_tree_selection_select_path (gtk_tree_view_get_selection (tree_view), tree_path);
@@ -465,7 +465,7 @@
                 g_free (comment_escaped);
 
                 /* Check if this is the active theme, if so, select it */
-                if (G_UNLIKELY (g_utf8_collate (theme_name, active_theme_name) == 0))
+                if (G_UNLIKELY (g_utf8_collate (file, active_theme_name) == 0))
                 {
                     tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
                     gtk_tree_selection_select_path (gtk_tree_view_get_selection (tree_view), tree_path);