Commit 10f292dc authored by Bastien Nocera's avatar Bastien Nocera
Browse files

shell: Remove unused gnome-menus helper files

parent 1c98f642
......@@ -143,6 +143,5 @@ panels/wacom/gnome-wacom-panel.desktop.in.in
panels/wacom/gsd-wacom-device.c
[type: gettext/glade]panels/wacom/wacom-stylus-page.ui
shell/control-center.c
shell/gnomecc.directory.in
shell/gnome-control-center.desktop.in.in
[type: gettext/glade]shell/shell.ui
......@@ -68,14 +68,7 @@ endif
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DUIDIR="\"$(uidir)\"" \
-DMENUDIR="\"$(menudir)\""
menudir = $(sysconfdir)/xdg/menus
menu_DATA = gnomecc.menu
gnomecc.menu: gnomecc.menu.in
$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
-DUIDIR="\"$(uidir)\""
uidir = $(pkgdatadir)/ui
ui_DATA = shell.ui
......@@ -85,17 +78,10 @@ sys_in_files = gnome-control-center.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
directorydir = $(datadir)/desktop-directories
directory_in_files = gnomecc.directory.in
directory_DATA = $(directory_in_files:.directory.in=.directory)
@INTLTOOL_DIRECTORY_RULE@
EXTRA_DIST = \
$(ui_DATA) \
gnome-control-center.desktop.in.in \
gnomecc.directory.in \
gnomecc.menu.in
gnome-control-center.desktop.in.in
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory gnomecc.menu
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
-include $(top_srcdir)/git.mk
[Desktop Entry]
_Name=Control Center
Icon=gnome-settings
Type=Directory
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Control Center</Name>
<Directory>gnomecc.directory</Directory>
<!-- Read standard .directory and .desktop file locations -->
<AppDir>@applicationsdir@</AppDir>
<DefaultDirectoryDirs/>
<!-- Read in overrides and child menus from gnomecc-merged/ -->
<DefaultMergeDirs/>
<!-- Sort the control center categories -->
<Layout>
<Menuname>Personal</Menuname>
<Menuname>Hardware</Menuname>
<Menuname>System</Menuname>
<Menuname>Other</Menuname>
<Merge type="all" />
</Layout>
<!-- Stuff in the toplevel (Other category) -->
<Include>
<And>
<Category>Settings</Category>
<Not>
<Or>
<Category>X-GNOME-PersonalSettings</Category>
<Category>DesktopSettings</Category>
<Category>HardwareSettings</Category>
<Category>X-GNOME-SystemSettings</Category>
<Category>System</Category>
</Or>
</Not>
</And>
</Include>
<!-- Avoid the shell having a launcher for itself -->
<Exclude>
<Filename>gnome-control-center.desktop</Filename>
</Exclude>
<!-- Personal category -->
<Menu>
<Name>Personal</Name>
<Directory>Personal.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Category>X-GNOME-PersonalSettings</Category>
<Category>X-GNOME-Settings-Panel</Category>
</And>
</Include>
</Menu> <!-- End Personal -->
<!-- Hardware category -->
<Menu>
<Name>Hardware</Name>
<Directory>Hardware.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Category>HardwareSettings</Category>
<Category>X-GNOME-Settings-Panel</Category>
</And>
</Include>
</Menu> <!-- End Hardware -->
<!-- System category -->
<Menu>
<Name>System</Name>
<Directory>System.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Category>X-GNOME-SystemSettings</Category>
<Category>X-GNOME-Settings-Panel</Category>
</And>
</Include>
</Menu> <!-- End System -->
</Menu> <!-- End CC -->
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment