diff -Nru gnome-menus-2.30.5.orig/layout/applications.menu gnome-menus-2.30.5/layout/applications.menu
--- gnome-menus-2.30.5.orig/layout/applications.menu 2010-02-09 13:21:04.000000000 +0100
+++ gnome-menus-2.30.5/layout/applications.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,154 +0,0 @@
-
-
-
diff -Nru gnome-menus-2.30.5.orig/layout/gnome-applications.menu gnome-menus-2.30.5/layout/gnome-applications.menu
--- gnome-menus-2.30.5.orig/layout/gnome-applications.menu 1970-01-01 01:00:00.000000000 +0100
+++ gnome-menus-2.30.5/layout/gnome-applications.menu 2010-02-09 13:21:04.000000000 +0100
@@ -0,0 +1,154 @@
+
+
+
+
+ Applications
+ X-GNOME-Menu-Applications.directory
+
+
+
+ /etc/X11/applnk
+ /usr/share/gnome/apps
+
+
+
+
+
+
+
+
+
+
+ Accessories
+ Utility.directory
+
+
+ Utility
+
+ Accessibility
+ System
+
+
+
+
+
+
+ Universal Access
+ Utility-Accessibility.directory
+
+
+ Accessibility
+ Settings
+
+
+
+
+
+
+ Development
+ Development.directory
+
+
+ Development
+
+ emacs.desktop
+
+
+
+
+
+ Education
+ Education.directory
+
+
+ Education
+
+
+
+
+
+
+ Games
+ Game.directory
+
+
+ Game
+
+
+
+
+
+
+ Graphics
+ Graphics.directory
+
+
+ Graphics
+
+
+
+
+
+
+ Internet
+ Network.directory
+
+
+ Network
+
+
+
+
+
+
+ Multimedia
+ AudioVideo.directory
+
+
+ AudioVideo
+
+
+
+
+
+
+ Office
+ Office.directory
+
+
+ Office
+
+
+
+
+
+
+ System
+ System-Tools.directory
+
+
+ System
+ Settings
+
+
+
+
+
+
+ Other
+ X-GNOME-Other.directory
+
+
+
+ Core
+ Settings
+ Screensaver
+
+
+
+
+
diff -Nru gnome-menus-2.30.5.orig/layout/gnome-settings.menu gnome-menus-2.30.5/layout/gnome-settings.menu
--- gnome-menus-2.30.5.orig/layout/gnome-settings.menu 1970-01-01 01:00:00.000000000 +0100
+++ gnome-menus-2.30.5/layout/gnome-settings.menu 2010-02-09 13:21:04.000000000 +0100
@@ -0,0 +1,57 @@
+
+
+
+
+ Desktop
+ X-GNOME-Menu-System.directory
+
+
+
+
+
+
+
+
+
+
+ gnomecc.desktop
+
+
+
+
+ Preferences
+ Settings.directory
+
+
+ Settings
+
+
+ System
+ gnomecc.desktop
+
+
+
+
+
+
+
+
+ Administration
+ Settings-System.directory
+
+
+ Settings
+ System
+
+
+
+
+
+ Preferences
+ Administration
+
+
+
+
+
diff -Nru gnome-menus-2.30.5.orig/layout/Makefile.am gnome-menus-2.30.5/layout/Makefile.am
--- gnome-menus-2.30.5.orig/layout/Makefile.am 2010-09-20 17:44:39.000000000 +0200
+++ gnome-menus-2.30.5/layout/Makefile.am 2012-08-05 19:40:26.728330641 +0200
@@ -1,8 +1,8 @@
menudir = $(sysconfdir)/xdg/menus
menu_DATA = \
- applications.menu \
- settings.menu
+ gnome-applications.menu \
+ gnome-settings.menu
EXTRA_DIST= $(menu_DATA)
diff -Nru gnome-menus-2.30.5.orig/layout/Makefile.in gnome-menus-2.30.5/layout/Makefile.in
--- gnome-menus-2.30.5.orig/layout/Makefile.in 2010-11-17 12:10:17.000000000 +0100
+++ gnome-menus-2.30.5/layout/Makefile.in 2012-08-05 19:40:19.612404185 +0200
@@ -254,8 +254,8 @@
top_srcdir = @top_srcdir@
menudir = $(sysconfdir)/xdg/menus
menu_DATA = \
- applications.menu \
- settings.menu
+ gnome-applications.menu \
+ gnome-settings.menu
EXTRA_DIST = $(menu_DATA)
all: all-am
diff -Nru gnome-menus-2.30.5.orig/layout/settings.menu gnome-menus-2.30.5/layout/settings.menu
--- gnome-menus-2.30.5.orig/layout/settings.menu 2010-02-09 13:21:04.000000000 +0100
+++ gnome-menus-2.30.5/layout/settings.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-
-
-
-
- Desktop
- X-GNOME-Menu-System.directory
-
-
-
-
-
-
-
-
-
-
- gnomecc.desktop
-
-
-
-
- Preferences
- Settings.directory
-
-
- Settings
-
-
- System
- gnomecc.desktop
-
-
-
-
-
-
-
-
- Administration
- Settings-System.directory
-
-
- Settings
- System
-
-
-
-
-
- Preferences
- Administration
-
-
-
-
-
diff -Nru gnome-menus-2.30.5.orig/libmenu/gmenu-tree.c gnome-menus-2.30.5/libmenu/gmenu-tree.c
--- gnome-menus-2.30.5.orig/libmenu/gmenu-tree.c 2010-10-06 16:11:48.000000000 +0200
+++ gnome-menus-2.30.5/libmenu/gmenu-tree.c 2012-08-05 19:38:22.047619235 +0200
@@ -540,7 +540,7 @@
{
gmenu_tree_remove_menu_file_monitors (tree);
- if (strcmp (tree->basename, "applications.menu") == 0 &&
+ if (strcmp (tree->basename, "gnome-applications.menu") == 0 &&
g_getenv ("XDG_MENU_PREFIX"))
{
char *prefixed_basename;
@@ -1923,7 +1923,7 @@
found = FALSE;
menu_file = g_strconcat (menu_name, ".menu", NULL);
- if (strcmp (menu_file, "applications.menu") == 0 &&
+ if (strcmp (menu_file, "gnome-applications.menu") == 0 &&
g_getenv ("XDG_MENU_PREFIX"))
{
char *prefixed_basename;
diff -Nru gnome-menus-2.30.5.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py gnome-menus-2.30.5/simple-editor/GMenuSimpleEditor/menutreemodel.py
--- gnome-menus-2.30.5.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py 2010-11-17 12:07:53.000000000 +0100
+++ gnome-menus-2.30.5/simple-editor/GMenuSimpleEditor/menutreemodel.py 2012-08-05 19:38:47.854352518 +0200
@@ -104,10 +104,10 @@
self.icon_theme = gtk.icon_theme_get_default ()
if (len (menu_files) < 1):
- menu_files = ["applications.menu", "settings.menu"]
+ menu_files = ["gnome-applications.menu", "gnome-settings.menu"]
for menu_file in menu_files:
- if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
+ if menu_file == "gnome-applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
diff -Nru gnome-menus-2.30.5.orig/util/gnome-menus-ls.py gnome-menus-2.30.5/util/gnome-menus-ls.py
--- gnome-menus-2.30.5.orig/util/gnome-menus-ls.py 2010-02-09 13:21:04.000000000 +0100
+++ gnome-menus-2.30.5/util/gnome-menus-ls.py 2012-08-05 19:39:14.752073667 +0200
@@ -71,7 +71,7 @@
if options.file:
menu_file = options.file
else:
- menu_file = 'applications.menu'
+ menu_file = 'gnome-applications.menu'
flags = gmenu.FLAGS_NONE
if options.exclude:
diff -Nru gnome-menus-2.30.5.orig/util/test-menu-spec.c gnome-menus-2.30.5/util/test-menu-spec.c
--- gnome-menus-2.30.5.orig/util/test-menu-spec.c 2010-03-15 11:14:21.000000000 +0100
+++ gnome-menus-2.30.5/util/test-menu-spec.c 2012-08-05 19:39:00.700219728 +0200
@@ -206,7 +206,7 @@
if (include_nodisplay)
flags |= GMENU_TREE_FLAGS_INCLUDE_NODISPLAY;
- tree = gmenu_tree_lookup (menu_file ? menu_file : "applications.menu", flags);
+ tree = gmenu_tree_lookup (menu_file ? menu_file : "gnome-applications.menu", flags);
g_assert (tree != NULL);
root = gmenu_tree_get_root_directory (tree);