1 files changed, 0 insertions, 172 deletions
diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c
deleted file mode 100644
index bd405098f5fa..000000000000
--- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c
+++ /dev/null
@@ -1,172 +0,0 @@
---- libmenu/menu-tree.c.orig	Tue Jun 28 04:05:19 2005
-+++ libmenu/menu-tree.c	Tue Jun 28 04:05:42 2005
-@@ -67,6 +67,12 @@
-   gpointer            user_data;
- } MenuTreeMonitor;
- 
-+typedef struct
-+{
-+  MenuTreeDirectory *directory;
-+  GSList            *list;
-+} MenuTreeListifyForeachData;
-+
- struct MenuTreeDirectory
- {
-   MenuTreeDirectory *parent;
-@@ -75,6 +81,7 @@
-   char         *name;
- 
-   GSList *entries;
-+  GSList *excluded_entries;
-   GSList *subdirs;
- 
-   guint refcount : 24;
-@@ -750,17 +757,15 @@
-     }
- }
- 
--GSList *
--menu_tree_directory_get_entries (MenuTreeDirectory *directory)
-+static GSList *
-+copy_and_ref_entry_list (GSList *list)
- {
-   GSList *retval;
-   GSList *tmp;
- 
--  g_return_val_if_fail (directory != NULL, NULL);
--
-   retval = NULL;
- 
--  tmp = directory->entries;
-+  tmp = list;
-   while (tmp != NULL)
-     {
-       retval = g_slist_prepend (retval,
-@@ -773,6 +778,22 @@
- }
- 
- GSList *
-+menu_tree_directory_get_entries (MenuTreeDirectory *directory)
-+{
-+  g_return_val_if_fail (directory != NULL, NULL);
-+
-+  return copy_and_ref_entry_list (directory->entries);
-+}
-+
-+GSList *
-+menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory)
-+{
-+  g_return_val_if_fail (directory != NULL, NULL);
-+
-+  return copy_and_ref_entry_list (directory->excluded_entries);
-+}
-+
-+GSList *
- menu_tree_directory_get_subdirs (MenuTreeDirectory *directory)
- {
-   GSList *retval;
-@@ -939,6 +960,7 @@
-   retval->name             = g_strdup (name);
-   retval->directory_entry  = NULL;
-   retval->entries          = NULL;
-+  retval->excluded_entries = NULL;
-   retval->subdirs          = NULL;
-   retval->only_unallocated = FALSE;
-   retval->refcount         = 1;
-@@ -2554,16 +2576,21 @@
- }
- 
- static void
--entries_listify_foreach (const char        *desktop_file_id,
--                         DesktopEntry      *desktop_entry,
--                         MenuTreeDirectory *directory)
-+entries_listify_foreach (const char                 *desktop_file_id,
-+                         DesktopEntry               *desktop_entry,
-+                         MenuTreeListifyForeachData *foreach_data)
- {
-   MenuTreeEntry *entry;
- 
--  entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id);
-+  g_return_if_fail (foreach_data);
-+  g_return_if_fail (foreach_data->directory);
-+
-+  entry = menu_tree_entry_new (foreach_data->directory,
-+		  	       desktop_entry,
-+			       desktop_file_id);
- 
--  directory->entries = g_slist_prepend (directory->entries,
--                                        entry);
-+  foreach_data->list = g_slist_prepend (foreach_data->list,
-+		  			entry);
- }
- 
- static MenuTreeDirectory *
-@@ -2576,11 +2603,14 @@
-   MenuTreeDirectory  *directory;
-   DesktopEntrySet    *entry_pool;
-   DesktopEntrySet    *entries;
-+  DesktopEntrySet    *excluded_entries;
-   gboolean            deleted;
-   DesktopEntrySet    *allocated_set;
-   gboolean            only_unallocated;
-   GSList             *tmp;
- 
-+  MenuTreeListifyForeachData foreach_data;
-+
-   g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU);
-   g_assert (menu_layout_node_menu_get_name (layout) != NULL);
- 
-@@ -2594,6 +2624,7 @@
-   only_unallocated = FALSE;
- 
-   entries = desktop_entry_set_new ();
-+  excluded_entries = desktop_entry_set_new ();
-   allocated_set = desktop_entry_set_new ();
- 
-   entry_pool = desktop_entry_set_new ();
-@@ -2644,6 +2675,7 @@
-                 if (rule_set != NULL)
-                   {
-                     desktop_entry_set_union (entries, rule_set);
-+                    desktop_entry_set_subtract (excluded_entries, rule_set);
-                     desktop_entry_set_union (allocated_set, rule_set);
-                     desktop_entry_set_unref (rule_set);
-                   }
-@@ -2676,6 +2708,7 @@
-                 if (rule_set != NULL)
-                   {
-                     desktop_entry_set_subtract (entries, rule_set);
-+                    desktop_entry_set_union (excluded_entries, rule_set);
-                     desktop_entry_set_unref (rule_set);
-                   }
- 
-@@ -2775,14 +2808,28 @@
-   if (deleted)
-     {
-       desktop_entry_set_unref (entries);
-+      desktop_entry_set_unref (excluded_entries);
-       menu_tree_directory_unref (directory);
-       return NULL;
-     }
- 
-+  foreach_data.directory = directory;
-+  foreach_data.list = NULL;
-   desktop_entry_set_foreach (entries,
-                              (DesktopEntrySetForeachFunc) entries_listify_foreach,
--                             directory);
-+                             &foreach_data);
-   desktop_entry_set_unref (entries);
-+
-+  directory->entries = foreach_data.list;
-+
-+  foreach_data.directory = directory;
-+  foreach_data.list = NULL;
-+  desktop_entry_set_foreach (excluded_entries,
-+		  	     (DesktopEntrySetForeachFunc) entries_listify_foreach,
-+			     &foreach_data);
-+  desktop_entry_set_unref (excluded_entries);
-+
-+  directory->excluded_entries = foreach_data.list;
- 
-   tmp = directory->entries;
-   while (tmp != NULL)