shell: Limit reading from our own apps directory

https://bugzilla.gnome.org/show_bug.cgi?id=657867
This commit is contained in:
Bastien Nocera 2011-09-02 14:24:25 +01:00
parent 22759b2116
commit fed883bbec
2 changed files with 6 additions and 3 deletions

View file

@ -45,6 +45,9 @@ AM_CPPFLAGS = \
menudir = $(sysconfdir)/xdg/menus menudir = $(sysconfdir)/xdg/menus
menu_DATA = gnomecc.menu menu_DATA = gnomecc.menu
gnomecc.menu: gnomecc.menu.in
$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
uidir = $(pkgdatadir)/ui uidir = $(pkgdatadir)/ui
ui_DATA = shell.ui ui_DATA = shell.ui
@ -62,9 +65,9 @@ EXTRA_DIST = \
$(ui_DATA) \ $(ui_DATA) \
gnome-control-center.desktop.in.in \ gnome-control-center.desktop.in.in \
gnomecc.directory.in \ gnomecc.directory.in \
gnomecc.menu \ gnomecc.menu.in \
cc-shell-marshal.list 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 -include $(top_srcdir)/git.mk

View file

@ -6,7 +6,7 @@
<Directory>gnomecc.directory</Directory> <Directory>gnomecc.directory</Directory>
<!-- Read standard .directory and .desktop file locations --> <!-- Read standard .directory and .desktop file locations -->
<DefaultAppDirs/> <AppDir>@applicationsdir@</AppDir>
<DefaultDirectoryDirs/> <DefaultDirectoryDirs/>
<!-- Read in overrides and child menus from gnomecc-merged/ --> <!-- Read in overrides and child menus from gnomecc-merged/ -->