+++ /dev/null
-diff -urN aa/desktop-file-utils-0.8/src/menu-entries.c desktop-file-utils-0.8/src/menu-entries.c
---- aa/desktop-file-utils-0.8/src/menu-entries.c 2004-09-07 18:34:42.398864448 +0200
-+++ desktop-file-utils-0.8/src/menu-entries.c 2004-09-07 18:37:29.455467984 +0200
-@@ -2035,6 +2035,7 @@
- GError *err;
- char *nodisplay_str;
- char *onlyshowin;
-+ char *notshowin;
- gboolean nodisplay;
-
- str = NULL;
-@@ -2089,6 +2090,33 @@
- g_free (onlyshowin);
- }
- }
-+
-+ if (cache->only_show_in_name && nodisplay == FALSE)
-+ {
-+ notshowin = find_value (str, "NotShowIn");
-+
-+ if (notshowin != NULL)
-+ {
-+ char **split;
-+ int i;
-+
-+ split = string_list_from_desktop_value (notshowin);
-+ i = 0;
-+ while (split[i] != NULL)
-+ {
-+ if (strcmp (split[i], cache->only_show_in_name) == 0)
-+ {
-+ nodisplay = TRUE;
-+ break;
-+ }
-+
-+ ++i;
-+ }
-+
-+ g_strfreev (split);
-+ g_free (notshowin);
-+ }
-+ }
-
- return entry_new (ENTRY_DIRECTORY, basename, filename, nodisplay);
- }
+++ /dev/null
-diff -urN aa/desktop-file-utils-0.8/src/menu-entries.c desktop-file-utils-0.8/src/menu-entries.c
---- aa/desktop-file-utils-0.8/src/menu-entries.c 2004-09-07 18:17:31.251622656 +0200
-+++ desktop-file-utils-0.8/src/menu-entries.c 2004-09-07 18:29:07.293808160 +0200
-@@ -2027,12 +2027,14 @@
- }
-
- static Entry*
--entry_new_directory_from_file (const char *filename,
-+entry_new_directory_from_file (EntryCache *cache,
-+ const char *filename,
- const char *basename)
- {
- char *str;
- GError *err;
- char *nodisplay_str;
-+ char *onlyshowin;
- gboolean nodisplay;
-
- str = NULL;
-@@ -2058,6 +2060,35 @@
-
- g_free (nodisplay_str);
- }
-+
-+ if (cache->only_show_in_name && nodisplay == FALSE)
-+ {
-+ onlyshowin = find_value (str, "OnlyShowIn");
-+
-+ if (onlyshowin != NULL)
-+ {
-+ char **split;
-+ int i;
-+
-+ nodisplay = TRUE;
-+
-+ split = string_list_from_desktop_value (onlyshowin);
-+ i = 0;
-+ while (split[i] != NULL)
-+ {
-+ if (strcmp (split[i], cache->only_show_in_name) == 0)
-+ {
-+ nodisplay = FALSE;
-+ break;
-+ }
-+
-+ ++i;
-+ }
-+
-+ g_strfreev (split);
-+ g_free (onlyshowin);
-+ }
-+ }
-
- return entry_new (ENTRY_DIRECTORY, basename, filename, nodisplay);
- }
-@@ -2162,7 +2193,7 @@
- {
- Entry *e;
-
-- e = entry_new_directory_from_file (fullpath, dent->d_name);
-+ e = entry_new_directory_from_file (dir->cache, fullpath, dent->d_name);
-
- menu_verbose ("Tried loading \"%s\": %s\n",
- fullpath, e ? "ok" : "failed");
+++ /dev/null
-diff -urN aa/desktop-file-utils-0.7/src/menu-process.c desktop-file-utils-0.7/src/menu-process.c
---- aa/desktop-file-utils-0.7/src/menu-process.c 2004-07-25 23:08:53.876735744 +0200
-+++ desktop-file-utils-0.7/src/menu-process.c 2004-07-26 00:30:05.416149184 +0200
-@@ -226,6 +226,23 @@
-
- ++i;
- }
-+
-+ MenuNode *mn;
-+ char *fx;
-+
-+ mn = menu_node_new (MENU_NODE_APP_DIR);
-+ fx = g_build_filename (g_get_home_dir(),
-+ ".gnome2/vfolders/applications",
-+ NULL);
-+ menu_node_set_content (mn, fx);
-+ menu_node_insert_before (node, mn);
-+
-+ menu_verbose ("Adding <AppDir>%s</AppDir> in <DefaultAppDirs/>\n",
-+ fx);
-+
-+ g_free (fx);
-+ menu_node_unref (mn);
-+
-
- /* remove the now-replaced node */
- menu_node_unlink (node);
+++ /dev/null
-applications: libmenu.so
-applications-all-users: libmenu.so
-all-applications: libmenu.so
+++ /dev/null
---- desktop-file-utils-0.6/src/menu-method.c.wiget 2004-07-21 14:27:59.483792832 +0200
-+++ desktop-file-utils-0.6/src/menu-method.c 2004-07-21 14:28:34.575975589 +0200
-@@ -155,11 +155,7 @@
- const char *scheme;
- const char *menu_file;
- } all_schemes[] = {
-- { "applications", "applications.menu" },
-- { "preferences", "preferences.menu" },
-- { "server-settings", "server-settings.menu" },
-- { "start-here", "start-here.menu" },
-- { "system-settings", "system-settings.menu" }
-+ { "applications", "applications.menu" }
- };
-
- static const char*
+++ /dev/null
-diff -urN aa/desktop-file-utils-0.8/src/menu-entries.c desktop-file-utils-0.8/src/menu-entries.c
---- aa/desktop-file-utils-0.8/src/menu-entries.c 2004-09-03 00:05:27.000000000 +0200
-+++ desktop-file-utils-0.8/src/menu-entries.c 2004-09-07 17:56:17.089324768 +0200
-@@ -1966,6 +1966,50 @@
- return NULL;
- }
- }
-+
-+ if (cache->only_show_in_name)
-+ {
-+ char *notshowin;
-+ gboolean show;
-+
-+ show = TRUE;
-+
-+ notshowin = find_value (str, "NotShowIn");
-+
-+ if (notshowin != NULL)
-+ {
-+ char **split;
-+ int i;
-+
-+ show = TRUE;
-+
-+ split = string_list_from_desktop_value (notshowin);
-+ i = 0;
-+ while (split[i] != NULL)
-+ {
-+ if (strcmp (split[i], cache->only_show_in_name) == 0)
-+ {
-+ show = FALSE;
-+ break;
-+ }
-+
-+ ++i;
-+ }
-+
-+ if (!show)
-+ menu_verbose ("Not showing \"%s\" due to NotShowIn=%s\n",
-+ filename, notshowin);
-+
-+ g_strfreev (split);
-+ g_free (notshowin);
-+ }
-+
-+ if (!show)
-+ {
-+ g_free (str);
-+ return NULL;
-+ }
-+ }
-
- e = entry_new (ENTRY_DESKTOP, basename, filename, FALSE);
-