[gnome-menus] layout: Deal with some vendor renames

[William Jon McCann <mccann src gnome org>]

commit a06c0348c1a129ffd996e00615d5d6d25b17dcdc
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Feb 17 02:25:42 2013 +0100

    layout: Deal with some vendor renames
    
    The menu spec doesn't offer very specific guidance for how
    to use vendor prefixes. And it isn't even clear about what
    a vendor is. Or how it helps avoid collisions with a naming scheme
    that isn't fully qualified in the first place.
    
    Longer term we should move to something that uses fully qualified
    names like the dbus spec. In the meantime we have to deal with
    "aliases" for app names.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694131

 layout/gnome-applications.menu |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
index a29cc6f..2841d91 100644
--- a/layout/gnome-applications.menu
+++ b/layout/gnome-applications.menu
@@ -35,9 +35,11 @@
         <!-- Also exclude everything we put in the X-GNOME-Utilities
              whitelist -->
         <Not><Filename>file-roller.desktop</Filename></Not>
+        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
         <Not><Filename>gnome-calculator.desktop</Filename></Not>
         <Not><Filename>gucharmap.desktop</Filename></Not>
+        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
         <Not><Filename>gnome-font-viewer.desktop</Filename></Not>
         <Not><Filename>seahorse.desktop</Filename></Not>
         <Not><Filename>gnome-terminal.desktop</Filename></Not>
@@ -106,6 +108,7 @@
       <And>
         <Category>Graphics</Category>
         <Not><Filename>eog.desktop</Filename></Not>
+        <Not><Filename>gnome-eog.desktop</Filename></Not>
         <Not><Filename>evince.desktop</Filename></Not>
       </And>
     </Include>
@@ -221,6 +224,11 @@
       <And>
         <Not><Category>Core</Category></Not>
         <Not><Category>Screensaver</Category></Not>
+
+        <!-- Really Fedora ??? -->
+        <Not><Filename>gnome-eog.desktop</Filename></Not>
+        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Other -->