gnome-menus r897 - in trunk: . libmenu

[vuntz svn gnome org]

Author: vuntz
Date: Mon May 19 00:08:26 2008
New Revision: 897
URL: http://svn.gnome.org/viewvc/gnome-menus?rev=897&view=rev

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

	* libmenu/gmenu-tree.c: (load_parent_merge_file): do not return the
	fact that we've found a base directory, but the fact that we really a
	found a parent menu file in a base directory. Fix a bug where the
	fallback on the filename in <MergeFile> couldn't be used. 


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 00:08:26 2008
@@ -1848,7 +1848,7 @@
   g_free (menu_file);
   g_free (canonical_basedir);
 
-  return found_basedir;
+  return system_config_dirs[i] != NULL;
 }
 
 static void