[Xfce4-commits] <garcon:master> Fix search order of xdg data directories (bug #7187).

[Nick Schermer]

Updating branch refs/heads/master
         to 5e0525c346064f88159535f64b8e92caa77f97fd (commit)
       from 78fd5b4a096565d002179f029cc86a679603514b (commit)

commit 5e0525c346064f88159535f64b8e92caa77f97fd
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Wed Apr 6 18:29:50 2011 +0200

    Fix search order of xdg data directories (bug #7187).

 garcon/garcon-menu-merger.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index 70f5a43..59801e3 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -421,7 +421,7 @@ garcon_menu_merger_insert_default_dirs (GNode *parent,
 
   /* The $KDEDIR workaround ends here */
 
-  /* Append system-wide data dirs */
+  /* Append system-wide data dirs, respecting the priority */
   dirs = g_get_system_data_dirs ();
   for (i = 0; dirs[i] != NULL; i++)
     {
@@ -429,7 +429,7 @@ garcon_menu_merger_insert_default_dirs (GNode *parent,
       if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
         {
           node = g_node_new (garcon_menu_node_create (type, path));
-          prev_node = g_node_insert_after (parent, prev_node, node);
+          g_node_insert_after (parent, prev_node, node);
         }
       g_free (path);
     }
@@ -439,7 +439,7 @@ garcon_menu_merger_insert_default_dirs (GNode *parent,
   if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
     {
       node = g_node_new (garcon_menu_node_create (type, path));
-      prev_node = g_node_insert_after (parent, prev_node, node);
+      prev_node = g_node_append (parent, node);
     }
   g_free (path);
 }
@@ -473,7 +473,7 @@ garcon_menu_merger_insert_default_merge_dirs (GNode       *parent,
 
   prev_node = defaults_node;
 
-  /* Append system-wide config dirs */
+  /* Append system-wide config dirs, respecting the priority */
   dirs = g_get_system_config_dirs ();
   for (i = 0; dirs[i] != NULL; i++)
     {
@@ -482,7 +482,7 @@ garcon_menu_merger_insert_default_merge_dirs (GNode       *parent,
       if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
         {
           node = g_node_new (garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
-          prev_node = g_node_insert_after (parent, prev_node, node);
+          g_node_insert_after (parent, prev_node, node);
         }
       g_free (path);
     }
@@ -493,7 +493,7 @@ garcon_menu_merger_insert_default_merge_dirs (GNode       *parent,
   if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
     {
       node = g_node_new (garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
-      prev_node = g_node_insert_after (parent, prev_node, node);
+      prev_node = g_node_append (parent, node);
     }
   g_free (path);
 }