gnome-menus r878 - in trunk: . libmenu

[vuntz svn gnome org]

Author: vuntz
Date: Sat Apr 12 11:50:46 2008
New Revision: 878
URL: http://svn.gnome.org/viewvc/gnome-menus?rev=878&view=rev

Log:
2008-04-12  Vincent Untz  <vuntz gnome org>

	* libmenu/gmenu-tree.c: (process_layout): if showing excluded items (as
	in alacarte), remove an entry from the excluded set if it's explicitly
	included after the <Exclude> node.
	Fix bug #441198.


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	Sat Apr 12 11:50:46 2008
@@ -3159,6 +3159,8 @@
                   {
                     desktop_entry_set_union (entries, rule_set);
                     desktop_entry_set_union (allocated_set, rule_set);
+		    if (excluded_set != NULL)
+		      desktop_entry_set_subtract (excluded_set, rule_set);
                     desktop_entry_set_unref (rule_set);
                   }