From fed883bbec403dfc27526e3ca624db8c5e71f6a2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 2 Sep 2011 14:24:25 +0100
Subject: [PATCH] shell: Limit reading from our own apps directory

https://bugzilla.gnome.org/show_bug.cgi?id=657867
---
 shell/Makefile.am                       | 7 +++++--
 shell/{gnomecc.menu => gnomecc.menu.in} | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename shell/{gnomecc.menu => gnomecc.menu.in} (98%)

diff --git a/shell/Makefile.am b/shell/Makefile.am
index d6a4f71b4..a3a11af4b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -45,6 +45,9 @@ AM_CPPFLAGS =							\
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA = gnomecc.menu
 
+gnomecc.menu: gnomecc.menu.in
+	$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
+
 uidir = $(pkgdatadir)/ui
 ui_DATA = shell.ui
 
@@ -62,9 +65,9 @@ EXTRA_DIST =					\
 	$(ui_DATA)				\
 	gnome-control-center.desktop.in.in	\
 	gnomecc.directory.in			\
-	gnomecc.menu				\
+	gnomecc.menu.in				\
 	cc-shell-marshal.list
 
-DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory
+DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory gnomecc.menu
 
 -include $(top_srcdir)/git.mk
diff --git a/shell/gnomecc.menu b/shell/gnomecc.menu.in
similarity index 98%
rename from shell/gnomecc.menu
rename to shell/gnomecc.menu.in
index edf829a17..63945558b 100644
--- a/shell/gnomecc.menu
+++ b/shell/gnomecc.menu.in
@@ -6,7 +6,7 @@
   <Directory>gnomecc.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
-  <DefaultAppDirs/>
+  <AppDir>@applicationsdir@</AppDir>
   <DefaultDirectoryDirs/>
 
   <!-- Read in overrides and child menus from gnomecc-merged/ -->