[Xfce4-commits] <garcon:master> Monitor non-existing data and config directories (bug #7423).

[Nick Schermer]

Updating branch refs/heads/master
         to 5cfabfa6d2daf31110bf6911fdd317f6af805fe5 (commit)
       from 0f23d47f8854fc531b1ce04fa49fc3bdcb482572 (commit)

commit 5cfabfa6d2daf31110bf6911fdd317f6af805fe5
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Apr 6 18:38:16 2011 +0200

    Monitor non-existing data and config directories (bug #7423).

 garcon/garcon-menu-merger.c |   37 +++++++++++--------------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index 59801e3..76f8654 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -408,12 +408,9 @@ garcon_menu_merger_insert_default_dirs (GNode *parent,
       /* Build KDE data dir */
       kde_data_dir = g_build_filename (kde_dir, "share", base_name, NULL);
 
-      /* Add it as a directory dir if it exists */
-      if (G_LIKELY (g_file_test (kde_data_dir, G_FILE_TEST_IS_DIR)))
-        {
-          node = g_node_new (garcon_menu_node_create (type, kde_data_dir));
-          prev_node = g_node_insert_after (parent, prev_node, node);
-        }
+      /* Add it as a directory dir */
+      node = g_node_new (garcon_menu_node_create (type, kde_data_dir));
+      prev_node = g_node_insert_after (parent, prev_node, node);
 
       /* Free the KDE data dir */
       g_free (kde_data_dir);
@@ -426,21 +423,15 @@ garcon_menu_merger_insert_default_dirs (GNode *parent,
   for (i = 0; dirs[i] != NULL; i++)
     {
       path = g_build_path (G_DIR_SEPARATOR_S, dirs[i], base_name, NULL);
-      if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
-        {
-          node = g_node_new (garcon_menu_node_create (type, path));
-          g_node_insert_after (parent, prev_node, node);
-        }
+      node = g_node_new (garcon_menu_node_create (type, path));
+      g_node_insert_after (parent, prev_node, node);
       g_free (path);
     }
 
   /* Append user data dir */
   path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), base_name, NULL);
-  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_append (parent, node);
-    }
+  node = g_node_new (garcon_menu_node_create (type, path));
+  prev_node = g_node_append (parent, node);
   g_free (path);
 }
 
@@ -479,22 +470,16 @@ garcon_menu_merger_insert_default_merge_dirs (GNode       *parent,
     {
       path = g_build_path (G_DIR_SEPARATOR_S, dirs[i], "menus", 
                            merge_dir_basename, NULL);
-      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));
-          g_node_insert_after (parent, prev_node, node);
-        }
+      node = g_node_new (garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
+      g_node_insert_after (parent, prev_node, node);
       g_free (path);
     }
 
   /* Append user config dir */
   path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_config_dir (), "menus",
                        merge_dir_basename, NULL);
-  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_append (parent, node);
-    }
+  node = g_node_new (garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
+  prev_node = g_node_append (parent, node);
   g_free (path);
 }