From 9915038e9b73ad283fd91315131b80670675992e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Tue, 1 Feb 2011 15:26:31 +0100
Subject: [PATCH] Drop gs-applications.menu so the standard one is used

gs-applications was introduced because we initially wanted a limited set
of categories, but this has now changed and we're back to categories
similar to the ones in the applications.menu from gnome-menus.

We can fix gnome-menus to have better categories, if needed.

https://bugzilla.gnome.org/show_bug.cgi?id=641148
---
 data/Makefile.am          |  5 ---
 data/gs-applications.menu | 85 ---------------------------------------
 src/gnome-shell-plugin.c  |  1 -
 3 files changed, 91 deletions(-)
 delete mode 100644 data/gs-applications.menu

diff --git a/data/Makefile.am b/data/Makefile.am
index 103e30b84..1f207ef78 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -72,11 +72,6 @@ all-local: gschemas.compiled
 gconfschemadir  = @GCONF_SCHEMA_FILE_DIR@
 gconfschema_DATA = gnome-shell.schemas
 
-menudir = $(sysconfdir)/xdg/menus
-
-menu_DATA = \
-	gs-applications.menu
-
 shadersdir = $(pkgdatadir)/shaders
 shaders_DATA = \
 	shaders/dim-window.glsl
diff --git a/data/gs-applications.menu b/data/gs-applications.menu
deleted file mode 100644
index b26ed0066..000000000
--- a/data/gs-applications.menu
+++ /dev/null
@@ -1,85 +0,0 @@
-<Menu>
-	<DefaultLayout>
-		<Menuname>Accessories</Menuname>
-		<Menuname>Games</Menuname>
-		<Menuname>Graphics</Menuname>
-		<Menuname>Internet</Menuname>
-		<Menuname>Multimedia</Menuname>
-		<Menuname>Office</Menuname>
-		<Menuname>Other</Menuname>
-	</DefaultLayout>
-
-	<Name>Applications</Name>
-	<AppDir>/usr/local/share/applications</AppDir>
-	<DefaultAppDirs/>
-
-	<Menu>
-		<Name>Accessories</Name>
-		<Include>
-			<And>
-				<Category>Utility</Category>
-				<Not>
-					<Category>System</Category>
-				</Not>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Games</Name>
-		<Include>
-			<And>
-				<Category>Game</Category>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Graphics</Name>
-		<Include>
-			<And>
-				<Category>Graphics</Category>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Internet</Name>
-		<Include>
-			<And>
-				<Category>Network</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Multimedia</Name>
-		<Include>
-			<And>
-				<Category>AudioVideo</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Office</Name>
-		<Include>
-			<And>
-				<Category>Office</Category>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Other</Name>
-		<OnlyUnallocated/>
-		<Include>
-			<And>
-				<Not><Category>Settings</Category></Not>
-				<Not><Category>Screensaver</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-</Menu>
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 59823bd94..1fe7de570 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -157,7 +157,6 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
 static void
 gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
 {
-  g_setenv ("XDG_MENU_PREFIX", "gs-", TRUE);
   meta_prefs_override_preference_location ("/apps/mutter/general/attach_modal_dialogs",
                                            "/desktop/gnome/shell/windows/attach_modal_dialogs");
   meta_prefs_override_preference_location ("/apps/metacity/general/button_layout",