gnome-menus r900 - in trunk: . libmenu

[vuntz svn gnome org]

Author: vuntz
Date: Mon May 19 01:01:30 2008
New Revision: 900
URL: http://svn.gnome.org/viewvc/gnome-menus?rev=900&view=rev

Log:
2008-05-19  Vincent Untz  <vuntz gnome org>

	* libmenu/gmenu-tree.c: (load_parent_merge_file): use the right
	basename with XDG_MENU_PREFIX (fix previous commit)


Modified:
   trunk/ChangeLog
   trunk/libmenu/gmenu-tree.c

Modified: trunk/libmenu/gmenu-tree.c
==============================================================================
--- trunk/libmenu/gmenu-tree.c	(original)
+++ trunk/libmenu/gmenu-tree.c	Mon May 19 01:01:30 2008
@@ -1868,7 +1868,7 @@
       char *prefixed_basename;
       prefixed_basename = g_strdup_printf ("%s%s",
                                            g_getenv ("XDG_MENU_PREFIX"),
-                                           tree->basename);
+                                           menu_file);
       found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
                                                     layout, prefixed_basename,
                                                     canonical_basedir);