From 9e7b0ed69e45d129aa0d720a1e9a4d41b599a794 Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date: Sun, 27 Dec 2015 15:35:46 +0100
Subject:  move preferences-categories.menu to mate-menus

---
 shell/Makefile.am                      |   4 +-
 shell/mate-preferences-categories.menu | 114 ---------------------------------
 2 files changed, 2 insertions(+), 116 deletions(-)
 delete mode 100644 shell/mate-preferences-categories.menu

(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 5f449f52..ea502fd7 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -27,9 +27,9 @@ directory_DATA = $(directory_in_files:.directory.in=.directory)
 @INTLTOOL_DIRECTORY_RULE@
 
 menudir = $(sysconfdir)/xdg/menus
-menu_DATA = matecc.menu mate-preferences-categories.menu
+menu_DATA = matecc.menu
 
-EXTRA_DIST = matecc.desktop.in.in matecc.directory.in matecc.menu mate-preferences-categories.menu
+EXTRA_DIST = matecc.desktop.in.in matecc.directory.in matecc.menu
 
 DISTCLEANFILES = matecc.desktop matecc.desktop.in matecc.directory
 
diff --git a/shell/mate-preferences-categories.menu b/shell/mate-preferences-categories.menu
deleted file mode 100644
index bd897269..00000000
--- a/shell/mate-preferences-categories.menu
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-  <Name>Preferences</Name>
- 
-  <Menu>
-    <Name>Personal</Name>
-    <Directory>mate-personal.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-MATE-PersonalSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-PersonalSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-SystemSettings</Category>
-        <Category>Archiving</Category>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>Accessibility</Category>
-      </And>
-    </Include>
-  </Menu>
-
-  <Menu>
-    <Name>Look and Feel</Name>
-    <Directory>mate-look-and-feel.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>DesktopSettings</Category>
-        <Not><Category>System</Category></Not>
-        <Not><Category>Security</Category></Not>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>Qt</Category>
-        <Not><Category>System</Category></Not>
-        <Not><Category>Security</Category></Not>
-      </And>
-    </Include>
-  </Menu>
-
-  <Menu>
-    <Name>Internet and Network</Name>
-    <Directory>mate-internet-and-network.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-MATE-NetworkSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-NetworkSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-      <And>
-        <Category>Settings</Category>
-        <Category>Security</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu>
-
-  <Menu>
-    <Name>Hardware</Name>
-    <Directory>mate-hardware.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>HardwareSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu>
-
-  <Menu>
-    <Name>Other</Name>
-    <Directory>mate-other.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Not><Category>Accessibility</Category></Not>
-        <Not><Category>System</Category></Not>
-        <Not><Category>DesktopSettings</Category></Not>
-        <Not><Category>HardwareSettings</Category></Not>
-        <Not><Category>Security</Category></Not>
-        <Not><Category>Archiving</Category></Not>
-        <Not><Category>Qt</Category></Not>
-        <Not><Category>X-MATE-NetworkSettings</Category></Not>
-        <Not><Category>X-GNOME-NetworkSettings</Category></Not>
-        <Not><Category>X-MATE-PersonalSettings</Category></Not>
-        <Not><Category>X-GNOME-PersonalSettings</Category></Not>
-      </And>
-    </Include>
-    <Exclude>
-      <Filename>matecc.desktop</Filename>
-    </Exclude>
-  </Menu>
-
-  <Exclude>
-    <Category>Settings</Category>
-  </Exclude>
-</Menu>
-
-- 
cgit v1.2.1