[gnome-menus] Revert "gmenu-tree: Properly implement <OnlyUnallocated />"

[Jasper St. Pierre <jstpierre src gnome org>]

commit eb12c4675adfd969163d8da73b243a9a30b349c6
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Apr 30 02:39:02 2013 -0400

    Revert "gmenu-tree: Properly implement <OnlyUnallocated />"
    
    This reverts commit c5a85ac55d656870fc339fc448efc27e91b507dc.
    
    This breaks as soon as the user starts installing override files,
    since that messes with the order of directores.
    
    Not sure what the proper way to implement this would be, but this
    isn't it.

 libmenu/gmenu-tree.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 80d5876..ac55eeb 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -3605,7 +3605,8 @@ process_layout (GMenuTree          *tree,
 
   directory->only_unallocated = only_unallocated;
 
-  desktop_entry_set_union (allocated, entries);
+  if (!directory->only_unallocated)
+    desktop_entry_set_union (allocated, entries);
 
   if (directory->directory_entry)
     {
@@ -3731,8 +3732,7 @@ process_only_unallocated (GMenuTree          *tree,
           GMenuTreeEntry *entry = tmp->data;
           GSList         *next  = tmp->next;
 
-          if (desktop_entry_set_lookup (allocated, entry->desktop_file_id) &&
-              desktop_entry_set_lookup (unallocated_used, entry->desktop_file_id))
+          if (desktop_entry_set_lookup (allocated, entry->desktop_file_id))
             {
               directory->entries = g_slist_delete_link (directory->entries,
                                                         tmp);