[gnome-menus] Revert "Remove the special casing for Fedora desktop vendor renames"

[William Jon McCann <mccann src gnome org>]

commit af5d71c573cda0e3527ea935516454dc3cd35e28
Author: William Jon McCann <william jon mccann gmail com>
Date:   Sun Mar 3 15:33:51 2013 -0500

    Revert "Remove the special casing for Fedora desktop vendor renames"
    
    This reverts commit 5cc05790a308bbf7a5905254e377d3ca47df603b.
    
    We should really wait a bit before pushing this so the changes have
    time to propagate.

 layout/gnome-applications.menu |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
index d1bc1aa..dd06d93 100644
--- a/layout/gnome-applications.menu
+++ b/layout/gnome-applications.menu
@@ -36,15 +36,19 @@
         <!-- 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>gcalctool.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>
         <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>
         <Not><Filename>gnome-disks.desktop</Filename></Not>
         <Not><Filename>gnome-screenshot.desktop</Filename></Not>
+        <Not><Filename>gnome-yelp.desktop</Filename></Not>
         <Not><Filename>yelp.desktop</Filename></Not>
         <Not><Filename>gnome-control-center.desktop</Filename></Not>
       </And>
@@ -109,6 +113,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>
@@ -260,6 +265,7 @@
       <Filename>gnome-tweak-tool.desktop</Filename>
       <Filename>gnome-disks.desktop</Filename>
       <Filename>gnome-screenshot.desktop</Filename>
+      <Filename>gnome-yelp.desktop</Filename>
       <Filename>yelp.desktop</Filename>
       <Filename>gnome-control-center.desktop</Filename>
     </Include>
@@ -274,6 +280,12 @@
       <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>
+        <Not><Filename>gcalctool.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Other -->