Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > by-pkgid > ee5019e51831f214d532979b59ea2d61 > files > 27

kdelibs-3.4.2-31.4.20060mdk.src.rpm

--- kdelibs-3.3.2/kio/kio/kservice.cpp.fix_create_menu_associate_file	2005-02-08 18:28:08.000000000 +0100
+++ kdelibs-3.3.2/kio/kio/kservice.cpp	2005-02-10 10:51:26.498347900 +0100
@@ -771,6 +771,7 @@ QString KService::newServicePath(bool sh
                                 QString *menuId, const QStringList *reservedMenuIds)
 {
    QString base = suggestedName;
+   QString typeMenu = KStandardDirs::menu_type_by_version();
    if (!showInMenu)
      base.prepend("kde-");
 
@@ -798,8 +799,16 @@ QString KService::newServicePath(bool sh
       else
       {
          QString file = result.mid(4); // Strip "kde-"
-         if (!locate("apps", ".hidden/"+file).isEmpty())
-            continue;
+		 if( typeMenu=="kde")
+		 {
+         	if (!locate("apps", ".hidden/"+file).isEmpty())
+            	continue;
+		 }
+		 else
+		 {
+			 if (!locate("xdgdata-apps", "Mandrakelinux/.hidden/"+file).isEmpty())
+				continue;
+		 }
       }
 
       break;
@@ -814,7 +823,10 @@ QString KService::newServicePath(bool sh
    else
    {
        QString file = result.mid(4); // Strip "kde-"
-       return ::locateLocal("apps", ".hidden/"+file);
+	   if( typeMenu=="kde")
+	       return ::locateLocal("apps", ".hidden/"+file);
+	   else
+		  return ::locateLocal("xdgdata-apps", "Mandrakelinux/.hidden/"+file);
    }
 }