Commit 5f4e1400 authored by Bastien Nocera's avatar Bastien Nocera
Browse files

shell: Remove unused gnomecc.menu file

Searching for Settings is now handled through a search provider
in gnome-control-center, for which the display is special-cased in
gnome-shell.
parent a11be9e2
......@@ -86,12 +86,6 @@ endif
AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
menudir = $(sysconfdir)/xdg/menus
menu_DATA = gnomecc.menu
gnomecc.menu: gnomecc.menu.in
$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
sysdir = $(datadir)/applications
sys_in_files = gnome-control-center.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
......@@ -107,10 +101,9 @@ EXTRA_DIST = \
gnome-control-center.desktop.in.in \
$(completion_in_files) \
list-panel.sh \
gnomecc.menu.in
CLEANFILES = $(BUILT_SOURCES) $(completion_DATA)
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.menu
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
noinst_PROGRAMS = test-hostname
test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
......
<!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>X-GNOME-SystemSettings.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 -->
Markdown is supported
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