|
Link Here
|
| 1 |
From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Giovanni Campagna <gcampagn@redhat.com> |
| 3 |
Date: Mon, 26 Aug 2013 15:59:18 +0200 |
| 4 |
Subject: [PATCH] layout: don't use OnlyUnallocated for sections different than |
| 5 |
Other |
| 6 |
|
| 7 |
We used to have OnlyUnallocated on all non-folder sections, as |
| 8 |
a quick way to enforce the whitelist, but that broke the Other |
| 9 |
section. |
| 10 |
Instead, we need a whitelist in the two folders, and a blacklist |
| 11 |
in each category the application would normally be in (accessories |
| 12 |
or system tools usually). |
| 13 |
Ideally, apps in the Utilities category would expose the special |
| 14 |
X-GNOME-Utilities desktop category, which we now recognize, but |
| 15 |
the whitelist is kept to avoid patching all of them. |
| 16 |
For the sundry category, ideally it should not be there at all. |
| 17 |
|
| 18 |
In the process, a number of .desktop files were removed, as they're |
| 19 |
not provided by any packages (checked jhbuild and Fedora 19). They |
| 20 |
are: |
| 21 |
* caribou |
| 22 |
* fedora-im-chooser |
| 23 |
* fedora-abrt |
| 24 |
* gnome-orca |
| 25 |
* gnome-user-share-properties |
| 26 |
* ibus |
| 27 |
* ibus-daemon |
| 28 |
|
| 29 |
Distributions that are changing .desktop file names should take |
| 30 |
care of patching gnome-menus appropriately. |
| 31 |
|
| 32 |
https://bugzilla.gnome.org/show_bug.cgi?id=706763 |
| 33 |
--- |
| 34 |
layout/gnome-applications.menu | 137 ++++++++++++++++++++++++----------------- |
| 35 |
1 file changed, 82 insertions(+), 55 deletions(-) |
| 36 |
|
| 37 |
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu |
| 38 |
index 503f9ca..db56f71 100644 |
| 39 |
--- a/layout/gnome-applications.menu |
| 40 |
+++ b/layout/gnome-applications.menu |
| 41 |
@@ -21,44 +21,49 @@ |
| 42 |
<!-- Accessories submenu --> |
| 43 |
<Menu> |
| 44 |
<Name>Accessories</Name> |
| 45 |
- <OnlyUnallocated/> |
| 46 |
<Directory>Utility.directory</Directory> |
| 47 |
<Include> |
| 48 |
<And> |
| 49 |
<Category>Utility</Category> |
| 50 |
- <!-- Accessibility spec must have either the Utility or Settings |
| 51 |
- category, and we display an accessibility submenu already for |
| 52 |
- the ones that do not have Settings, so don't display accessibility |
| 53 |
- applications here --> |
| 54 |
+ <!-- Accessibility spec must have either the Utility or Settings |
| 55 |
+ category, and we display an accessibility submenu already for |
| 56 |
+ the ones that do not have Settings, so don't display accessibility |
| 57 |
+ applications here --> |
| 58 |
<Not><Category>Accessibility</Category></Not> |
| 59 |
<Not><Category>System</Category></Not> |
| 60 |
- |
| 61 |
- <!-- Also exclude everything we put in the X-GNOME-Utilities |
| 62 |
- whitelist --> |
| 63 |
- <Not><Filename>file-roller.desktop</Filename></Not> |
| 64 |
- <Not><Filename>gnome-file-roller.desktop</Filename></Not> |
| 65 |
- <Not><Filename>deja-dup-preferences.desktop</Filename></Not> |
| 66 |
- <Not><Filename>gcalctool.desktop</Filename></Not> |
| 67 |
- <Not><Filename>gucharmap.desktop</Filename></Not> |
| 68 |
- <Not><Filename>gnome-gucharmap.desktop</Filename></Not> |
| 69 |
- <Not><Filename>gnome-font-viewer.desktop</Filename></Not> |
| 70 |
- <Not><Filename>seahorse.desktop</Filename></Not> |
| 71 |
- <Not><Filename>gnome-terminal.desktop</Filename></Not> |
| 72 |
- <Not><Filename>gnome-tweak-tool.desktop</Filename></Not> |
| 73 |
- <Not><Filename>gnome-disks.desktop</Filename></Not> |
| 74 |
- <Not><Filename>gnome-screenshot.desktop</Filename></Not> |
| 75 |
- <Not><Filename>gnome-yelp.desktop</Filename></Not> |
| 76 |
- <Not><Filename>yelp.desktop</Filename></Not> |
| 77 |
- <Not><Filename>gnome-control-center.desktop</Filename></Not> |
| 78 |
+ <Not><Category>X-GNOME-Utilities</Category></Not> |
| 79 |
</And> |
| 80 |
</Include> |
| 81 |
+ <Exclude> |
| 82 |
+ <!-- Exclude everything we put in the X-GNOME-Utilities whitelist. |
| 83 |
+ |
| 84 |
+ Please keep the list alphabetically sorted! --> |
| 85 |
+ <Filename>deja-dup-preferences.desktop</Filename> |
| 86 |
+ <Filename>eog.desktop</Filename> |
| 87 |
+ <Filename>evince.desktop</Filename> |
| 88 |
+ <Filename>file-roller.desktop</Filename> |
| 89 |
+ <Filename>gcalctool.desktop</Filename> |
| 90 |
+ <Filename>gnome-control-center.desktop</Filename> |
| 91 |
+ <Filename>gnome-dictionary.desktop</Filename> |
| 92 |
+ <Filename>gnome-disks.desktop</Filename> |
| 93 |
+ <Filename>gnome-font-viewer.desktop</Filename> |
| 94 |
+ <Filename>gnome-screenshot.desktop</Filename> |
| 95 |
+ <Filename>gnome-terminal.desktop</Filename> |
| 96 |
+ <Filename>gnome-tweak-tool.desktop</Filename> |
| 97 |
+ <Filename>gucharmap.desktop</Filename> |
| 98 |
+ <Filename>seahorse.desktop</Filename> |
| 99 |
+ <Filename>vinagre.desktop</Filename> |
| 100 |
+ <Filename>yelp.desktop</Filename> |
| 101 |
+ |
| 102 |
+ <!-- Exclude Sundry items --> |
| 103 |
+ <Filename>alacarte.desktop</Filename> |
| 104 |
+ </Exclude> |
| 105 |
</Menu> <!-- End Accessories --> |
| 106 |
|
| 107 |
|
| 108 |
<!-- Accessibility submenu --> |
| 109 |
<Menu> |
| 110 |
<Name>Universal Access</Name> |
| 111 |
- <OnlyUnallocated/> |
| 112 |
<Directory>Utility-Accessibility.directory</Directory> |
| 113 |
<Include> |
| 114 |
<And> |
| 115 |
@@ -66,12 +71,16 @@ |
| 116 |
<Not><Category>Settings</Category></Not> |
| 117 |
</And> |
| 118 |
</Include> |
| 119 |
+ |
| 120 |
+ <Exclude> |
| 121 |
+ <!-- Sundry exclusions --> |
| 122 |
+ <Filename>orca.desktop</Filename> |
| 123 |
+ </Exclude> |
| 124 |
</Menu> <!-- End Accessibility --> |
| 125 |
|
| 126 |
<!-- Development Tools --> |
| 127 |
<Menu> |
| 128 |
<Name>Development</Name> |
| 129 |
- <OnlyUnallocated/> |
| 130 |
<Directory>Development.directory</Directory> |
| 131 |
<Include> |
| 132 |
<And> |
| 133 |
@@ -79,6 +88,15 @@ |
| 134 |
</And> |
| 135 |
<Filename>emacs.desktop</Filename> |
| 136 |
</Include> |
| 137 |
+ |
| 138 |
+ <Exclude> |
| 139 |
+ <!-- Sundry exclusions --> |
| 140 |
+ <Filename>jhbuild.desktop</Filename> |
| 141 |
+ <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename> |
| 142 |
+ <Filename>java-1.7.0-openjdk-policytool.desktop</Filename> |
| 143 |
+ <Filename>log4j-chainsaw.desktop</Filename> |
| 144 |
+ <Filename>log4j-logfactor5.desktop</Filename> |
| 145 |
+ </Exclude> |
| 146 |
</Menu> <!-- End Development Tools --> |
| 147 |
|
| 148 |
<!-- Education --> |
| 149 |
@@ -106,7 +124,6 @@ |
| 150 |
<!-- Graphics --> |
| 151 |
<Menu> |
| 152 |
<Name>Graphics</Name> |
| 153 |
- <OnlyUnallocated/> |
| 154 |
<Directory>Graphics.directory</Directory> |
| 155 |
<Include> |
| 156 |
<And> |
| 157 |
@@ -121,15 +138,21 @@ |
| 158 |
<!-- Internet --> |
| 159 |
<Menu> |
| 160 |
<Name>Internet</Name> |
| 161 |
- <OnlyUnallocated/> |
| 162 |
<Directory>Network.directory</Directory> |
| 163 |
<Include> |
| 164 |
<And> |
| 165 |
<Category>Network</Category> |
| 166 |
<Not><Category>X-GNOME-WebApplication</Category></Not> |
| 167 |
- <Not><Filename>vinagre.desktop</Filename></Not> |
| 168 |
</And> |
| 169 |
</Include> |
| 170 |
+ |
| 171 |
+ <Exclude> |
| 172 |
+ <!-- Utilities exclusions --> |
| 173 |
+ <Filename>vinagre.desktop</Filename> |
| 174 |
+ |
| 175 |
+ <!-- Sundry exclusions --> |
| 176 |
+ <Filename>javaws.desktop</Filename> |
| 177 |
+ </Exclude> |
| 178 |
</Menu> <!-- End Internet --> |
| 179 |
|
| 180 |
<!-- Web Applications --> |
| 181 |
@@ -147,7 +170,6 @@ |
| 182 |
<!-- Multimedia --> |
| 183 |
<Menu> |
| 184 |
<Name>Multimedia</Name> |
| 185 |
- <OnlyUnallocated/> |
| 186 |
<Directory>AudioVideo.directory</Directory> |
| 187 |
<Include> |
| 188 |
<And> |
| 189 |
@@ -159,7 +181,6 @@ |
| 190 |
<!-- Office --> |
| 191 |
<Menu> |
| 192 |
<Name>Office</Name> |
| 193 |
- <OnlyUnallocated/> |
| 194 |
<Directory>Office.directory</Directory> |
| 195 |
<Include> |
| 196 |
<And> |
| 197 |
@@ -176,20 +197,14 @@ |
| 198 |
<Directory>X-GNOME-Sundry.directory</Directory> |
| 199 |
<Include> |
| 200 |
<Filename>alacarte.desktop</Filename> |
| 201 |
- <Filename>caribou.desktop</Filename> |
| 202 |
+ <Filename>authconfig.desktop</Filename> |
| 203 |
<Filename>dconf-editor.desktop</Filename> |
| 204 |
- <Filename>fedora-im-chooser.desktop</Filename> |
| 205 |
<Filename>fedora-release-notes.desktop</Filename> |
| 206 |
<Filename>firewall-config.desktop</Filename> |
| 207 |
<Filename>flash-player-properties.desktop</Filename> |
| 208 |
<Filename>gconf-editor.desktop</Filename> |
| 209 |
<Filename>gnome-abrt.desktop</Filename> |
| 210 |
- <Filename>fedora-abrt.desktop</Filename> |
| 211 |
- <Filename>gnome-orca.desktop</Filename> |
| 212 |
<Filename>gnome-power-statistics.desktop</Filename> |
| 213 |
- <Filename>gnome-user-share-properties.desktop</Filename> |
| 214 |
- <Filename>ibus.desktop</Filename> |
| 215 |
- <Filename>ibus-daemon.desktop</Filename> |
| 216 |
<Filename>ibus-setup-anthy.desktop</Filename> |
| 217 |
<Filename>ibus-setup.desktop</Filename> |
| 218 |
<Filename>ibus-setup-hangul.desktop</Filename> |
| 219 |
@@ -208,7 +223,6 @@ |
| 220 |
<Filename>nm-connection-editor.desktop</Filename> |
| 221 |
<Filename>orca.desktop</Filename> |
| 222 |
<Filename>setroubleshoot.desktop</Filename> |
| 223 |
- <Filename>authconfig.desktop</Filename> |
| 224 |
<Filename>system-config-date.desktop</Filename> |
| 225 |
<Filename>system-config-firewall.desktop</Filename> |
| 226 |
<Filename>system-config-keyboard.desktop</Filename> |
| 227 |
@@ -222,17 +236,30 @@ |
| 228 |
<!-- System Tools--> |
| 229 |
<Menu> |
| 230 |
<Name>System</Name> |
| 231 |
- <OnlyUnallocated/> |
| 232 |
<Directory>System-Tools.directory</Directory> |
| 233 |
<Include> |
| 234 |
<And> |
| 235 |
<Category>System</Category> |
| 236 |
<Not><Category>Settings</Category></Not> |
| 237 |
- <Not><Filename>baobab.desktop</Filename></Not> |
| 238 |
- <Not><Filename>gnome-system-log.desktop</Filename></Not> |
| 239 |
- <Not><Filename>gnome-system-monitor.desktop</Filename></Not> |
| 240 |
+ <Not><Category>X-GNOME-Utilities</Category></Not> |
| 241 |
</And> |
| 242 |
</Include> |
| 243 |
+ |
| 244 |
+ <Exclude> |
| 245 |
+ <!-- Utilities exclusions --> |
| 246 |
+ <Filename>baobab.desktop</Filename> |
| 247 |
+ <Filename>gnome-system-log.desktop</Filename> |
| 248 |
+ <Filename>gnome-system-monitor.desktop</Filename> |
| 249 |
+ |
| 250 |
+ <!-- Sundry exclusions --> |
| 251 |
+ <Filename>dconf-editor.desktop</Filename> |
| 252 |
+ <Filename>fedora-release-notes.desktop</Filename> |
| 253 |
+ <Filename>gconf-editor.desktop</Filename> |
| 254 |
+ <Filename>gnome-abrt.desktop</Filename> |
| 255 |
+ <Filename>gnome-power-statistics.desktop</Filename> |
| 256 |
+ <Filename>dconf-editor.desktop</Filename> |
| 257 |
+ <Filename>setroubleshoot.desktop</Filename> |
| 258 |
+ </Exclude> |
| 259 |
</Menu> <!-- End System Tools --> |
| 260 |
|
| 261 |
<!-- System Settings --> |
| 262 |
@@ -249,26 +276,26 @@ |
| 263 |
<Name>Utilities</Name> |
| 264 |
<Directory>X-GNOME-Utilities.directory</Directory> |
| 265 |
<Include> |
| 266 |
+ <Category>X-GNOME-Utilities</Category> |
| 267 |
+ <Filename>baobab.desktop</Filename> |
| 268 |
+ <Filename>deja-dup-preferences.desktop</Filename> |
| 269 |
+ <Filename>eog.desktop</Filename> |
| 270 |
+ <Filename>evince.desktop</Filename> |
| 271 |
<Filename>file-roller.desktop</Filename> |
| 272 |
<Filename>gcalctool.desktop</Filename> |
| 273 |
- <Filename>gnome-font-viewer.desktop</Filename> |
| 274 |
- <Filename>gucharmap.desktop</Filename> |
| 275 |
- <Filename>seahorse.desktop</Filename> |
| 276 |
- <Filename>gnome-terminal.desktop</Filename> |
| 277 |
- <Filename>deja-dup-preferences.desktop</Filename> |
| 278 |
+ <Filename>gnome-control-center.desktop</Filename> |
| 279 |
<Filename>gnome-dictionary.desktop</Filename> |
| 280 |
- <Filename>evince.desktop</Filename> |
| 281 |
- <Filename>eog.desktop</Filename> |
| 282 |
- <Filename>baobab.desktop</Filename> |
| 283 |
+ <Filename>gnome-disks.desktop</Filename> |
| 284 |
+ <Filename>gnome-font-viewer.desktop</Filename> |
| 285 |
+ <Filename>gnome-screenshot.desktop</Filename> |
| 286 |
<Filename>gnome-system-log.desktop</Filename> |
| 287 |
<Filename>gnome-system-monitor.desktop</Filename> |
| 288 |
- <Filename>vinagre.desktop</Filename> |
| 289 |
+ <Filename>gnome-terminal.desktop</Filename> |
| 290 |
<Filename>gnome-tweak-tool.desktop</Filename> |
| 291 |
- <Filename>gnome-disks.desktop</Filename> |
| 292 |
- <Filename>gnome-screenshot.desktop</Filename> |
| 293 |
- <Filename>gnome-yelp.desktop</Filename> |
| 294 |
+ <Filename>gucharmap.desktop</Filename> |
| 295 |
+ <Filename>seahorse.desktop</Filename> |
| 296 |
+ <Filename>vinagre.desktop</Filename> |
| 297 |
<Filename>yelp.desktop</Filename> |
| 298 |
- <Filename>gnome-control-center.desktop</Filename> |
| 299 |
</Include> |
| 300 |
</Menu> |
| 301 |
|
| 302 |
-- |
| 303 |
1.8.3.1 |
