import sources

This commit is contained in:
Adam Samalik 2023-06-21 14:51:23 +02:00
parent 2fdbef02f3
commit 0488d30dfc
8 changed files with 519 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/redhat-menus-12.0.2.tar.gz
/redhat-menus-12.0.2.tar.gz

226
icon-names.patch Normal file
View File

@ -0,0 +1,226 @@
diff -up redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in.icon-names 2008-08-24 22:06:04.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in 2008-08-24 22:06:14.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Accessories
_Comment=Desktop accessories
-Icon=gnome-util
+Icon=applications-accessories
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Advanced-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Advanced-More.directory.in
diff -up redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in.icon-names redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in
--- redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in.icon-names 2008-08-24 22:06:47.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in 2008-08-24 22:07:02.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=All Applications
_Comment=All Applications
-Icon=gnome-applications.png
+Icon=applications-office
Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Desktop.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Desktop.directory.in
--- redhat-menus-8.9.11/desktop-files/Desktop.directory.in.icon-names 2008-08-24 22:07:16.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Desktop.directory.in 2008-08-24 22:07:32.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=System
_Comment=Personal preferences and administration settings
-Icon=gnome-settings
+Icon=preferences-desktop
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Development-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Development-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Development-More.directory.in.icon-names 2008-08-24 22:07:50.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Development-More.directory.in 2008-08-24 22:08:12.000000000 -0400
@@ -1,5 +1,5 @@
[Desktop Entry]
_Name=More Programming Tools
_Comment=Tools for software development
-Icon=gnome-devel
+Icon=applications-development
Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/Documentation.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Documentation.directory.in
--- redhat-menus-8.9.11/desktop-files/Documentation.directory.in.icon-names 2008-08-24 22:08:27.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Documentation.directory.in 2008-08-24 22:08:37.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Documentation
_Comment=Manuals and help documents
-Icon=gnome-help.png
+Icon=help-browser
Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in.icon-names 2008-08-24 22:08:49.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in 2008-08-24 22:08:59.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Documentation
_Comment=Manuals and help documents
-Icon=gnome-help.png
+Icon=help-browser
Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Games-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Games-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Games-More.directory.in.icon-names 2008-08-24 22:09:53.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Games-More.directory.in 2008-08-24 22:10:05.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Games
_Comment=Games and amusements
-Icon=gnome-joystick
+Icon=applications-games
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in.icon-names 2008-08-24 22:10:16.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in 2008-08-24 22:10:38.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Graphics Applications
_Comment=Graphics applications
-Icon=gnome-graphics
+Icon=applications-graphics
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Internet-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Internet-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Internet-More.directory.in.icon-names 2008-08-24 22:10:45.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Internet-More.directory.in 2008-08-24 22:10:57.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Internet Applications
_Comment=Programs for Internet access such as web and email
-Icon=gnome-globe
+Icon=applications-internet
Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in.icon-names 2008-08-24 22:11:05.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in 2008-08-24 22:11:19.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Sound & Video Applications
_Comment=Multimedia menu
-Icon=gnome-multimedia
+Icon=applications-multimedia
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Office-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Office-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Office-More.directory.in.icon-names 2008-08-24 22:11:28.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Office-More.directory.in 2008-08-24 22:13:50.000000000 -0400
@@ -1,5 +1,5 @@
[Desktop Entry]
_Name=More Office Applications
_Comment=Additional office applications
-Icon=gnome-applications
+Icon=applications-office
Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/Root.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Root.directory.in
--- redhat-menus-8.9.11/desktop-files/Root.directory.in.icon-names 2008-08-24 22:14:37.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Root.directory.in 2008-08-24 22:14:44.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Programs
_Comment=Programs menu
-Icon=gnome-folder.png
+Icon=folder
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in.icon-names redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in
--- redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in.icon-names 2008-08-24 22:15:31.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in 2008-08-24 22:15:50.000000000 -0400
@@ -2,5 +2,5 @@
Type=Directory
_Name=Server Settings
_Comment=Configure network services (web server, DNS server, etc.)
-Icon=redhat-server_settings.png
+Icon=preferences-system-network
Terminal=0
diff -up redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in
--- redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in.icon-names 2008-08-24 22:16:01.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in 2008-08-24 22:16:15.000000000 -0400
@@ -2,5 +2,5 @@
Type=Directory
_Name=More Server Settings
_Comment=Configure network services (web server, DNS server, etc.)
-Icon=redhat-server_settings.png
+Icon=preferences-system-network
Terminal=0
diff -up redhat-menus-8.9.11/desktop-files/Settings-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Settings-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Settings-More.directory.in.icon-names 2008-08-24 22:17:19.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Settings-More.directory.in 2008-08-24 22:17:27.000000000 -0400
@@ -1,5 +1,5 @@
[Desktop Entry]
_Name=More Preferences
_Comment=Personal preferences and settings
-Icon=gnome-settings
+Icon=preferences-desktop
Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in.icon-names redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in
--- redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in.icon-names 2008-08-24 22:18:28.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in 2008-08-24 22:18:40.000000000 -0400
@@ -2,6 +2,6 @@
Type=Directory
_Name=Administration
_Comment=Change systemwide settings (affects all users)
-Icon=redhat-system_settings.png
+Icon=preferences-system
Terminal=0
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in
--- redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in.icon-names 2008-08-24 22:18:07.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in 2008-08-24 22:18:19.000000000 -0400
@@ -2,6 +2,6 @@
Type=Directory
_Name=More System Settings
_Comment=Change systemwide settings (affects all users)
-Icon=redhat-system_settings.png
+Icon=preferences-system
Terminal=0
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/System-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/System-More.directory.in
--- redhat-menus-8.9.11/desktop-files/System-More.directory.in.icon-names 2008-08-24 22:17:35.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/System-More.directory.in 2008-08-24 22:17:55.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More System Tools
_Comment=System configuration and monitoring
-Icon=gnome-system
+Icon=applications-system
Type=Directory
Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Utilities.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Utilities.directory.in
--- redhat-menus-8.9.11/desktop-files/Utilities.directory.in.icon-names 2008-08-24 22:19:10.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Utilities.directory.in 2008-08-24 22:19:22.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Utilities
_Comment=Utilities
-Icon=gnome-util.png
+Icon=applications-accessories
Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in.icon-names 2008-08-24 22:18:51.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in 2008-08-24 22:19:04.000000000 -0400
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=More Utilities
_Comment=Utilities
-Icon=gnome-util.png
+Icon=applications-accessories
Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8

24
nono.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up redhat-menus-8.9.11/configure.in.nb redhat-menus-8.9.11/configure.in
--- redhat-menus-8.9.11/configure.in.nb 2008-10-06 11:17:33.000000000 -0400
+++ redhat-menus-8.9.11/configure.in 2008-10-06 11:17:49.000000000 -0400
@@ -22,7 +22,7 @@ if test "x$GCC" = "xyes"; then
fi
changequote([,])dnl
-ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et fa fi fr gl gu he hi hr hu hy id ilo is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl no nso or pa pl pt_BR pt ro ru si sk sl sq sr@latin sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
+ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et fa fi fr gl gu he hi hr hu hy id ilo is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nso or pa pl pt_BR pt ro ru si sk sl sq sr@latin sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
AM_GLIB_GNU_GETTEXT
diff -up redhat-menus-8.9.11/configure.nb redhat-menus-8.9.11/configure
--- redhat-menus-8.9.11/configure.nb 2008-10-06 11:17:38.000000000 -0400
+++ redhat-menus-8.9.11/configure 2008-10-06 11:18:36.000000000 -0400
@@ -2318,7 +2318,7 @@ if test "x$GCC" = "xyes"; then
esac
fi
-ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et fa fi fr gl gu he hi hr hu hy id ilo is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl no nso or pa pl pt_BR pt ro ru si sk sl sq sr@latin sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
+ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et fa fi fr gl gu he hi hr hu hy id ilo is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nso or pa pl pt_BR pt ro ru si sk sl sq sr@latin sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
DEPDIR="${am__leading_dot}deps"

View File

@ -0,0 +1,69 @@
diff -up redhat-menus-10.0.0/menus/applications.menu.directory-rename redhat-menus-10.0.0/menus/applications.menu
--- redhat-menus-10.0.0/menus/applications.menu.directory-rename 2008-10-24 18:34:50.000000000 -0400
+++ redhat-menus-10.0.0/menus/applications.menu 2008-10-24 18:37:49.000000000 -0400
@@ -4,7 +4,7 @@
<Menu>
<Name>Applications</Name>
- <Directory>Applications.directory</Directory>
+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
<!-- Scan legacy dirs first, as later items take priority -->
<LegacyDir>/usr/share/gnome/apps</LegacyDir>
@@ -21,7 +21,7 @@
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
- <Directory>Accessories.directory</Directory>
+ <Directory>Utility.directory</Directory>
<Include>
<And>
<Category>Utility</Category>
@@ -57,7 +57,7 @@
<!-- Games -->
<Menu>
<Name>Games</Name>
- <Directory>Games.directory</Directory>
+ <Directory>Game.directory</Directory>
<Include>
<And>
<Category>Game</Category>
@@ -79,7 +79,7 @@
<!-- Internet -->
<Menu>
<Name>Internet</Name>
- <Directory>Internet.directory</Directory>
+ <Directory>Network.directory</Directory>
<Include>
<And>
<Category>Network</Category>
@@ -91,7 +91,7 @@
<!-- Multimedia -->
<Menu>
<Name>Multimedia</Name>
- <Directory>Multimedia.directory</Directory>
+ <Directory>AudioVideo.directory</Directory>
<Include>
<And>
<Category>AudioVideo</Category>
@@ -127,7 +127,7 @@
<!-- Other -->
<Menu>
<Name>Other</Name>
- <Directory>Other.directory</Directory>
+ <Directory>X-GNOME-Other.directory</Directory>
<OnlyUnallocated/>
<Include>
<And>
diff -up redhat-menus-10.0.0/menus/preferences.menu.directory-rename redhat-menus-10.0.0/menus/preferences.menu
--- redhat-menus-10.0.0/menus/preferences.menu.directory-rename 2007-10-01 18:00:02.000000000 -0400
+++ redhat-menus-10.0.0/menus/preferences.menu 2008-10-24 18:34:50.000000000 -0400
@@ -3,7 +3,7 @@
<Menu>
<Name>Preferences</Name>
- <Directory>Preferences.directory</Directory>
+ <Directory>Settings.directory</Directory>
<!-- Read standard .directory and .desktop file locations -->
<DefaultAppDirs/>

View File

@ -0,0 +1,40 @@
diff -up redhat-menus-8.9.11/desktop-files/redhat-evolution-tasks.desktop.in.evolution redhat-menus-8.9.11/desktop-files/redhat-evolution-tasks.desktop.in
--- redhat-menus-8.9.11/desktop-files/redhat-evolution-tasks.desktop.in.evolution 2008-01-05 18:47:35.000000000 -0500
+++ redhat-menus-8.9.11/desktop-files/redhat-evolution-tasks.desktop.in 2008-01-05 18:48:18.000000000 -0500
@@ -11,5 +11,5 @@ StartupNotify=True
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Version=2.12
-X-GNOME-Bugzilla-Component=Tasks
+X-GNOME-Bugzilla-Component=BugBuddyBugs
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-exchange-storage;evolution-alarm-notify;
diff -up redhat-menus-8.9.11/desktop-files/redhat-evolution-calendar.desktop.in.evolution redhat-menus-8.9.11/desktop-files/redhat-evolution-calendar.desktop.in
--- redhat-menus-8.9.11/desktop-files/redhat-evolution-calendar.desktop.in.evolution 2008-01-05 18:47:16.000000000 -0500
+++ redhat-menus-8.9.11/desktop-files/redhat-evolution-calendar.desktop.in 2008-01-05 18:47:51.000000000 -0500
@@ -11,5 +11,5 @@ StartupNotify=True
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Version=2.12
-X-GNOME-Bugzilla-Component=Calendar
+X-GNOME-Bugzilla-Component=BugBuddyBugs
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-exchange-storage;evolution-alarm-notify;
diff -up redhat-menus-8.9.11/desktop-files/redhat-evolution-contacts.desktop.in.evolution redhat-menus-8.9.11/desktop-files/redhat-evolution-contacts.desktop.in
--- redhat-menus-8.9.11/desktop-files/redhat-evolution-contacts.desktop.in.evolution 2008-01-05 18:47:25.000000000 -0500
+++ redhat-menus-8.9.11/desktop-files/redhat-evolution-contacts.desktop.in 2008-01-05 18:47:59.000000000 -0500
@@ -11,5 +11,5 @@ StartupNotify=True
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Version=2.12
-X-GNOME-Bugzilla-Component=Contacts
+X-GNOME-Bugzilla-Component=BugBuddyBugs
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-exchange-storage;evolution-alarm-notify;
diff -up redhat-menus-8.9.11/desktop-files/redhat-evolution-mail.desktop.in.evolution redhat-menus-8.9.11/desktop-files/redhat-evolution-mail.desktop.in
--- redhat-menus-8.9.11/desktop-files/redhat-evolution-mail.desktop.in.evolution 2008-01-05 18:47:31.000000000 -0500
+++ redhat-menus-8.9.11/desktop-files/redhat-evolution-mail.desktop.in 2008-01-05 18:48:08.000000000 -0500
@@ -11,5 +11,5 @@ StartupNotify=True
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Version=2.12
-X-GNOME-Bugzilla-Component=Mailer
+X-GNOME-Bugzilla-Component=BugBuddyBugs
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-exchange-storage;evolution-alarm-notify;

View File

@ -0,0 +1,35 @@
diff -up redhat-menus-8.9.11/menus/applications.menu.pirut redhat-menus-8.9.11/menus/applications.menu
--- redhat-menus-8.9.11/menus/applications.menu.pirut 2008-03-14 21:32:14.000000000 -0400
+++ redhat-menus-8.9.11/menus/applications.menu 2008-03-14 21:39:07.000000000 -0400
@@ -18,9 +18,6 @@
<!-- Add stock tarball installs to menus -->
<AppDir>/usr/local/share/applications</AppDir>
- <!-- Add a separator after the submenus -->
- <Layout><Merge type="menus"/><Separator/><Merge type="files"/></Layout>
-
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
@@ -125,10 +122,6 @@
<Not><Category>Screensaver</Category></Not>
</And>
</Include>
-
- <Exclude>
- <Filename>pirut.desktop</Filename>
- </Exclude>
</Menu> <!-- End System Tools -->
<!-- Other -->
@@ -147,10 +140,6 @@
</Include>
</Menu> <!-- End Other -->
- <Include>
- <Filename>pirut.desktop</Filename>
- </Include>
-
<MergeFile>applications-kmenuedit.menu</MergeFile>
<!-- Read in overrides and child menus from applications.d -->

View File

@ -0,0 +1,104 @@
diff -up redhat-menus-10.0.1/menus/preferences.menu.no-submenus redhat-menus-10.0.1/menus/preferences.menu
--- redhat-menus-10.0.1/menus/preferences.menu.no-submenus 2009-02-06 13:21:48.000000000 -0500
+++ redhat-menus-10.0.1/menus/preferences.menu 2009-02-06 13:21:55.000000000 -0500
@@ -12,29 +12,12 @@
<!-- Read in overrides and child menus from preferences-merged/ -->
<DefaultMergeDirs/>
- <!-- Sort the control center categories -->
- <Layout>
- <Menuname>Personal</Menuname>
- <Menuname>Look and Feel</Menuname>
- <Menuname>Internet and Network</Menuname>
- <Menuname>Hardware</Menuname>
- <Menuname>System</Menuname>
- <Merge type="all" />
- </Layout>
-
<!-- Stuff in the toplevel -->
<Include>
<And>
<Category>Settings</Category>
<Not>
- <Or>
- <Category>System</Category>
- <Category>DesktopSettings</Category>
- <Category>HardwareSettings</Category>
- <Category>X-GNOME-PersonalSettings</Category>
- <Category>X-GNOME-NetworkSettings</Category>
- <Category>X-GNOME-SystemSettings</Category>
- </Or>
+ <Category>System</Category>
</Not>
</And>
</Include>
@@ -44,69 +27,4 @@
<Filename>gnomecc.desktop</Filename>
</Exclude>
- <!-- Personal submenu -->
- <Menu>
- <Name>Personal</Name>
- <Directory>Personal.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>X-GNOME-PersonalSettings</Category>
- <Not><Category>System</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Personal -->
-
- <!-- Look and Feel submenu -->
- <Menu>
- <Name>Look and Feel</Name>
- <Directory>LookAndFeel.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>DesktopSettings</Category>
- <Not><Category>System</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Look and Feel -->
-
- <!-- Internet and Network submenu -->
- <Menu>
- <Name>Internet and Network</Name>
- <Directory>InternetAndNetwork.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>X-GNOME-NetworkSettings</Category>
- <Not><Category>System</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Internet and Network -->
-
- <!-- Hardware submenu -->
- <Menu>
- <Name>Hardware</Name>
- <Directory>Hardware.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>HardwareSettings</Category>
- <Not><Category>System</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Hardware -->
-
- <!-- System submenu -->
- <Menu>
- <Name>System</Name>
- <Directory>System.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
- <Category>X-GNOME-SystemSettings</Category>
- <Not><Category>System</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End System -->
-
</Menu> <!-- End Prefs -->

View File

@ -0,0 +1,21 @@
diff -up redhat-menus-10.0.1/menus/preferences.menu.categories redhat-menus-10.0.1/menus/preferences.menu
--- redhat-menus-10.0.1/menus/preferences.menu.categories 2009-02-25 00:10:51.612815552 -0500
+++ redhat-menus-10.0.1/menus/preferences.menu 2009-02-25 00:11:06.782816607 -0500
@@ -9,9 +9,6 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
- <!-- Read in overrides and child menus from preferences-merged/ -->
- <DefaultMergeDirs/>
-
<!-- Stuff in the toplevel -->
<Include>
<And>
@@ -27,4 +24,7 @@
<Filename>gnomecc.desktop</Filename>
</Exclude>
+ <!-- Read in overrides and child menus from preferences-merged/ -->
+ <DefaultMergeDirs/>
+
</Menu> <!-- End Prefs -->