Bug#289650: Shows KDE items in the gnome menu

[Sjoerd Simons]

This is a multi-part MIME message sent by reportbug.

--===============1896030615==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: libgnomevfs2-common
Version: 2.8.3-8
Severity: normal
Tags: patch

When both KDE and gnome are installed, the main gnome menu shows the kde items
too.. Which isn't very nice.

See http://fire.luon.net/~sjoerd/scareseb128.png for example..

Attached patch bans KDE stuff from the gnome menu...

  Sjoerd

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.9-spring
Locale: LANG=C, LC_CTYPE=nl_NL@euro (charmap=ISO-8859-15)

Versions of packages libgnomevfs2-common depends on:
ii  gconf2                      2.8.1-4      GNOME configuration database syste
ii  gnome-mime-data             2.4.1-2      base MIME and Application database
ii  libbonobo2-0                2.8.0-4      Bonobo CORBA interfaces library
ii  libbz2-1.0                  1.0.2-2      high-quality block-sorting file co
ii  libc6                       2.3.2.ds1-20 GNU C Library: Shared libraries an
ii  libfam0c102                 2.7.0-6      client library to control the FAM 
ii  libgconf2-4                 2.8.1-4      GNOME configuration database syste
ii  libgcrypt11                 1.2.0-11     LGPL Crypto library - runtime libr
ii  libglib2.0-0                2.4.8-1      The GLib library of C routines
ii  libgnomevfs2-0              2.8.3-8      The GNOME virtual file-system libr
ii  libgnutls11                 1.0.16-13    GNU TLS library - runtime library
ii  libgpg-error0               1.0-1        library for common error values an
ii  libhowl0                    0.9.8-2      Library for Zeroconf service disco
ii  liborbit2                   1:2.10.2-1.1 libraries for ORBit2 - a CORBA ORB
ii  libpopt0                    1.7-5        lib for parsing cmdline parameters
ii  libsmbclient                3.0.10-1     shared library that allows applica
ii  libtasn1-2                  0.2.10-4     Manage ASN.1 structures (runtime)
ii  libxml2                     2.6.11-5     GNOME XML library
ii  shared-mime-info            0.15-1       FreeDesktop.org shared MIME databa
ii  zlib1g                      1:1.2.2-4    compression library - runtime

-- no debconf information

--===============1896030615==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="14_no-kde-in-menu.patch"

--- modules/vfolder/applications-all-users.vfolder-info.in.orig	2005-01-09 15:09:25.000000000 +0000
+++ modules/vfolder/applications-all-users.vfolder-info.in	2005-01-09 15:18:46.504575825 +0000
@@ -33,7 +33,11 @@
 
     <Query>
       <And>
+        <Keyword>Application</Keyword>
         <Keyword>Core</Keyword>
+        <Not>
+          <Keyword>KDE</Keyword>
+        </Not>
 	<!-- FIXME: Seth, why would this be wanted? -->
 	<!--<Not>
 	  <Keyword>Merged</Keyword>
@@ -51,6 +55,7 @@
 	  <Keyword>Utility</Keyword>
 	  <Not>
 	    <Keyword>System</Keyword>
+      <Keyword>KDE</Keyword>
 	  </Not>
 	</And>
       </Query>
@@ -67,6 +72,7 @@
 	  <Keyword>Accessibility</Keyword>
 	  <Not>
 	    <Keyword>Settings</Keyword>
+      <Keyword>KDE</Keyword>
 	  </Not>
 	</And>
       </Query>
@@ -83,6 +89,7 @@
           <Keyword>Application</Keyword>
           <Not>
             <Keyword>Settings</Keyword>
+            <Keyword>KDE</Keyword>
           </Not>
         </And>
       </Query>
@@ -103,6 +110,9 @@
         <And>
           <Keyword>Application</Keyword>
 	  <Keyword>Development</Keyword>
+          <Not>
+            <Keyword>KDE</Keyword>
+          </Not>
         </And>
       </Query>
       <DontShowIfEmpty/>
@@ -116,6 +126,9 @@
         <And>
           <Keyword>Application</Keyword>
 	  <Keyword>Game</Keyword>
+          <Not>
+            <Keyword>KDE</Keyword>
+          </Not>
         </And>
       </Query>
       <DontShowIfEmpty/>
@@ -129,6 +142,9 @@
         <And>
           <Keyword>Application</Keyword>
 	  <Keyword>Graphics</Keyword>
+          <Not>
+            <Keyword>KDE</Keyword>
+          </Not>
         </And>
       </Query>
       <DontShowIfEmpty/>
@@ -142,6 +158,9 @@
         <And>
           <Keyword>Application</Keyword>
 	  <Keyword>Network</Keyword>
+          <Not>
+            <Keyword>KDE</Keyword>
+          </Not>
         </And>
       </Query>
       <DontShowIfEmpty/>
@@ -155,6 +174,9 @@
         <And>
           <Keyword>Application</Keyword>
 	  <Keyword>AudioVideo</Keyword>
+          <Not>
+            <Keyword>KDE</Keyword>
+          </Not>
         </And>
       </Query>
 
@@ -178,6 +200,9 @@
 	    <Keyword>Calendar</Keyword>
 	    <Keyword>ProjectManagement</Keyword>
 	  </Or>
+    <Not>
+      <Keyword>KDE</Keyword>
+    </Not>
 	</And>
       </Query>
       <DontShowIfEmpty/>
@@ -198,6 +223,7 @@
           <Keyword>Application</Keyword>
           <Not>
             <Keyword>Settings</Keyword>
+            <Keyword>KDE</Keyword>
           </Not>
           <Keyword>System</Keyword>
         </And>

--===============1896030615==--