summaryrefslogtreecommitdiffstats
path: root/x11/gnome-menus/files/patch-layout::applications.menu
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-menus/files/patch-layout::applications.menu')
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu42
1 files changed, 23 insertions, 19 deletions
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 116dad13f..9a0719a38 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,17 +1,19 @@
---- layout/applications.menu.orig 2008-04-21 15:49:29.000000000 -0400
-+++ layout/applications.menu 2008-04-28 14:51:24.000000000 -0400
-@@ -6,9 +6,8 @@
+--- layout/applications.menu.orig 2012-07-10 01:54:30.000000000 +0000
++++ layout/applications.menu 2013-03-30 10:41:37.311882486 +0000
+@@ -6,10 +6,9 @@
<Name>Applications</Name>
<Directory>X-GNOME-Menu-Applications.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
- <LegacyDir>/etc/X11/applnk</LegacyDir>
+- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ <!-- Scan legacy dirs first, as later items take priority
+ <LegacyDir>/etc/X11/applnk</LegacyDir> -->
- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
++ <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
+ <DefaultAppDirs/>
@@ -31,6 +30,8 @@
applications here -->
<Not><Category>Accessibility</Category></Not>
@@ -70,12 +72,12 @@
<Include>
<And>
<Category>Network</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Internet -->
-@@ -110,6 +123,8 @@
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ <Not>
+ <Category>X-GNOME-WebApplication</Category>
+ </Not>
+@@ -125,6 +138,8 @@
<Include>
<And>
<Category>AudioVideo</Category>
@@ -84,7 +86,7 @@
</And>
</Include>
</Menu> <!-- End Multimedia -->
-@@ -121,6 +136,8 @@
+@@ -136,6 +151,8 @@
<Include>
<And>
<Category>Office</Category>
@@ -93,7 +95,7 @@
</And>
</Include>
</Menu> <!-- End Office -->
-@@ -133,6 +150,8 @@
+@@ -148,6 +165,8 @@
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
@@ -102,12 +104,12 @@
</And>
</Include>
</Menu> <!-- End System Tools -->
-@@ -147,8 +166,197 @@
+@@ -162,10 +181,199 @@
<Not><Category>Core</Category></Not>
- <Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
+ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
@@ -174,7 +176,7 @@
+
+ <!-- KEducation -->
+ <Menu>
-+ <Name>Education</Name>
++ <Name>Education</Name>
+ <Directory>Education.directory</Directory>
+ <Include>
+ <And>
@@ -194,7 +196,7 @@
+ <Include>
+ <And>
+ <Or>
-+ <Category>Qt</Category>
++ <Category>Qt</Category>
+ <Category>KDE</Category>
+ </Or>
+ <Category>Game</Category>
@@ -299,4 +301,6 @@
+ </Menu> <!-- End KOther -->
+ </Menu> <!-- KDE -->
+
- </Menu> <!-- End Applications -->
+ <Layout>
+ <Merge type="menus" />
+ <Menuname>Other</Menuname>