File gnome-menus-xdg-menu-prefix.patch of Package gnome-menus

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-menus-xdg-menu-prefix.patch of Package gnome-menus (Revision 444369240cddf00e90dfd0419aab5a5a)

Currently displaying revision 444369240cddf00e90dfd0419aab5a5a , Show latest

diff -aurp gnome-menus-2.22.1/libmenu/gmenu-tree.c gnome-menus-2.22.1-patched/libmenu/gmenu-tree.c
--- gnome-menus-2.22.1/libmenu/gmenu-tree.c	2008-04-07 23:18:16.000000000 +0200
+++ gnome-menus-2.22.1-patched/libmenu/gmenu-tree.c	2008-05-19 03:15:42.421639000 +0200
@@ -494,6 +494,32 @@ canonicalize_basename_with_config_dir (G
   return tree->canonical;
 }
 
+static void
+canonicalize_basename (GMenuTree  *tree,
+                       const char *basename)
+{
+  if (!canonicalize_basename_with_config_dir (tree,
+                                              basename,
+                                              g_get_user_config_dir ()))
+    {
+      const char * const *system_config_dirs;
+      int                 i;
+
+      system_config_dirs = g_get_system_config_dirs ();
+
+      i = 0;
+      while (system_config_dirs[i] != NULL)
+        {
+          if (canonicalize_basename_with_config_dir (tree,
+                                                     basename,
+                                                     system_config_dirs[i]))
+            break;
+
+          ++i;
+        }
+    }
+}
+
 static gboolean
 gmenu_tree_canonicalize_path (GMenuTree *tree)
 {
@@ -506,26 +532,19 @@ gmenu_tree_canonicalize_path (GMenuTree 
     {
       gmenu_tree_remove_menu_file_monitors (tree);
 
-      if (!canonicalize_basename_with_config_dir (tree,
-						  tree->basename,
-						  g_get_user_config_dir ()))
-	{
-	  const char * const *system_config_dirs;
-	  int                 i;
-
-	  system_config_dirs = g_get_system_config_dirs ();
-
-	  i = 0;
-	  while (system_config_dirs[i] != NULL)
-	    {
-	      if (canonicalize_basename_with_config_dir (tree,
-							 tree->basename,
-							 system_config_dirs[i]))
-		break;
+      if (strcmp (tree->basename, "applications.menu") == 0 &&
+          g_getenv ("XDG_MENU_PREFIX"))
+        {
+          char *prefixed_basename;
+          prefixed_basename = g_strdup_printf ("%s%s",
+                                               g_getenv ("XDG_MENU_PREFIX"),
+                                               tree->basename);
+          canonicalize_basename (tree, prefixed_basename);
+          g_free (prefixed_basename);
+        }
 
-	      ++i;
-	    }
-	}
+      if (!tree->canonical)
+        canonicalize_basename (tree, tree->basename);
 
       if (tree->canonical)
         menu_verbose ("Successfully looked up menu_file for \"%s\": %s\n",
@@ -716,9 +735,31 @@ gmenu_tree_get_user_data (GMenuTree *tre
 const char *
 gmenu_tree_get_menu_file (GMenuTree *tree)
 {
+  /* FIXME: this is horribly ugly. But it's done to keep the API. Would be bad
+   * to break the API only for a "const char *" => "char *" change. The other
+   * alternative is to leak the memory, which is bad too. */
+  static char *ugly_result_cache = NULL;
+
   g_return_val_if_fail (tree != NULL, NULL);
 
-  return tree->type == GMENU_TREE_BASENAME ? tree->basename : tree->absolute_path;
+  /* we need to canonicalize the path so we actually find out the real menu
+   * file that is being used -- and take into account XDG_MENU_PREFIX */
+  if (!gmenu_tree_canonicalize_path (tree))
+    return NULL;
+
+  if (ugly_result_cache != NULL)
+    {
+      g_free (ugly_result_cache);
+      ugly_result_cache = NULL;
+    }
+
+  if (tree->type == GMENU_TREE_BASENAME)
+    {
+      ugly_result_cache = g_path_get_basename (tree->canonical_path);
+      return ugly_result_cache;
+    }
+  else
+    return tree->absolute_path;
 }
 
 GMenuTreeDirectory *
@@ -1670,7 +1711,7 @@ load_merge_file (GMenuTree      *tree,
 
   menu_verbose ("Merging file \"%s\"\n", canonical);
 
-  to_merge = menu_layout_load (canonical, NULL);
+  to_merge = menu_layout_load (canonical, NULL, NULL);
   if (to_merge == NULL)
     {
       menu_verbose ("No menu for file \"%s\" found when merging\n",
@@ -1751,34 +1792,18 @@ compare_basedir_to_config_dir (const cha
 }
 
 static gboolean
-load_parent_merge_file (GMenuTree      *tree,
-			GHashTable     *loaded_menu_files,
-			MenuLayoutNode *layout)
+load_parent_merge_file_from_basename (GMenuTree      *tree,
+                                      GHashTable     *loaded_menu_files,
+			              MenuLayoutNode *layout,
+                                      const char     *menu_file,
+                                      const char     *canonical_basedir)
 {
-  MenuLayoutNode     *root;
-  const char         *basedir;
-  const char         *menu_name;
-  char               *canonical_basedir;
-  char               *menu_file;
   gboolean            found_basedir;
   const char * const *system_config_dirs;
   int                 i;
 
-  root = menu_layout_node_get_root (layout);
-
-  basedir   = menu_layout_node_root_get_basedir (root);
-  menu_name = menu_layout_node_root_get_name (root);
-
-  canonical_basedir = menu_canonicalize_file_name (basedir, FALSE);
-  if (canonical_basedir == NULL)
-    {
-      menu_verbose ("Menu basedir '%s' no longer exists, not merging parent\n",
-		    basedir);
-      return FALSE;
-    }
-
-  menu_file = g_strconcat (menu_name, ".menu", NULL);
-
+  /* We're not interested in menu files that are in directories which are not a
+   * parent of the base directory of this menu file */
   found_basedir = compare_basedir_to_config_dir (canonical_basedir,
 						 g_get_user_config_dir ());
 
@@ -1810,10 +1835,61 @@ load_parent_merge_file (GMenuTree      *
       ++i;
     }
 
+  return system_config_dirs[i] != NULL;
+}
+
+static gboolean
+load_parent_merge_file (GMenuTree      *tree,
+			GHashTable     *loaded_menu_files,
+			MenuLayoutNode *layout)
+{
+  MenuLayoutNode     *root;
+  const char         *basedir;
+  const char         *menu_name;
+  char               *canonical_basedir;
+  char               *menu_file;
+  gboolean            found;
+
+  root = menu_layout_node_get_root (layout);
+
+  basedir   = menu_layout_node_root_get_basedir (root);
+  menu_name = menu_layout_node_root_get_name (root);
+
+  canonical_basedir = menu_canonicalize_file_name (basedir, FALSE);
+  if (canonical_basedir == NULL)
+    {
+      menu_verbose ("Menu basedir '%s' no longer exists, not merging parent\n",
+		    basedir);
+      return FALSE;
+    }
+
+  found = FALSE;
+  menu_file = g_strconcat (menu_name, ".menu", NULL);
+
+  if (strcmp (menu_file, "applications.menu") == 0 &&
+      g_getenv ("XDG_MENU_PREFIX"))
+    {
+      char *prefixed_basename;
+      prefixed_basename = g_strdup_printf ("%s%s",
+                                           g_getenv ("XDG_MENU_PREFIX"),
+                                           menu_file);
+      found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
+                                                    layout, prefixed_basename,
+                                                    canonical_basedir);
+      g_free (prefixed_basename);
+    }
+
+  if (!found)
+    {
+      found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
+                                                    layout, menu_file,
+                                                    canonical_basedir);
+    }
+
   g_free (menu_file);
   g_free (canonical_basedir);
 
-  return found_basedir;
+  return found;
 }
 
 static void
@@ -2788,7 +2864,10 @@ gmenu_tree_load_layout (GMenuTree *tree)
                 tree->canonical_path);
 
   error = NULL;
-  tree->layout = menu_layout_load (tree->canonical_path, &error);
+  tree->layout = menu_layout_load (tree->canonical_path,
+                                   tree->type == GMENU_TREE_BASENAME ?
+                                        tree->basename : NULL,
+                                   &error);
   if (tree->layout == NULL)
     {
       g_warning ("Error loading menu layout from \"%s\": %s",
diff -aurp gnome-menus-2.22.1/libmenu/menu-layout.c gnome-menus-2.22.1-patched/libmenu/menu-layout.c
--- gnome-menus-2.22.1/libmenu/menu-layout.c	2008-04-07 23:18:16.000000000 +0200
+++ gnome-menus-2.22.1-patched/libmenu/menu-layout.c	2008-05-19 03:15:26.320757000 +0200
@@ -2103,6 +2103,7 @@ menu_parser_free (MenuParser *parser)
 
 MenuLayoutNode *
 menu_layout_load (const char  *filename,
+                  const char  *non_prefixed_basename,
                   GError     **err)
 {
   GMarkupParseContext *context;
@@ -2141,7 +2142,10 @@ menu_layout_load (const char  *filename,
   root->basedir = g_path_get_dirname (filename);
   menu_verbose ("Set basedir \"%s\"\n", root->basedir);
 
-  s = g_path_get_basename (filename);
+  if (non_prefixed_basename)
+    s = g_strdup (non_prefixed_basename);
+  else
+    s = g_path_get_basename (filename);
   str = g_string_new (s);
   if (g_str_has_suffix (str->str, ".menu"))
     g_string_truncate (str, str->len - strlen (".menu"));
diff -aurp gnome-menus-2.22.1/libmenu/menu-layout.h gnome-menus-2.22.1-patched/libmenu/menu-layout.h
--- gnome-menus-2.22.1/libmenu/menu-layout.h	2008-04-07 23:18:16.000000000 +0200
+++ gnome-menus-2.22.1-patched/libmenu/menu-layout.h	2008-05-19 03:15:26.326747000 +0200
@@ -106,6 +106,7 @@ typedef struct
 
 
 MenuLayoutNode *menu_layout_load (const char  *filename,
+                                  const char  *non_prefixed_basename,
                                   GError     **error);
 
 MenuLayoutNode *menu_layout_node_new   (MenuLayoutNodeType  type);

Places

File gnome-menus-xdg-menu-prefix.patch of Package gnome-menus (Revision 444369240cddf00e90dfd0419aab5a5a)

Places