Sophie

Sophie

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

kdelibs-3.4.2-31.4.20060mdk.src.rpm

--- kdelibs-3.4.0/kio/kio/kservice.cpp--	2005-04-12 04:51:05.805627652 -0400
+++ kdelibs-3.4.0/kio/kio/kservice.cpp	2005-04-12 04:54:14.738925352 -0400
@@ -774,7 +774,12 @@ QString KService::newServicePath(bool sh
    QString base = suggestedName;
    QString typeMenu = KStandardDirs::menu_type_by_version();
    if (!showInMenu)
-     base.prepend("kde-");
+   {
+    if( typeMenu!="kde")
+       base.prepend("Mandrakelinux-.hidden-");
+    else
+       base.prepend("kde-");
+   }
 
    QString result;
    for(int i = 1; true; i++)
@@ -799,14 +804,15 @@ QString KService::newServicePath(bool sh
       }
       else
       {
-         QString file = result.mid(4); // Strip "kde-"
 		 if( typeMenu=="kde")
 		 {
+			QString file = result.mid(4); // Strip "kde-
          	if (!locate("apps", ".hidden/"+file).isEmpty())
             	continue;
 		 }
 		 else
 		 {
+			QString file = result.mid(22); // Strip "Mandrakelinux...
 			 if (!locate("xdgdata-apps", "Mandrakelinux/.hidden/"+file).isEmpty())
 				continue;
 		 }
@@ -825,9 +831,15 @@ QString KService::newServicePath(bool sh
    {
        QString file = result.mid(4); // Strip "kde-"
 	   if( typeMenu=="kde")
+		{
+			QString file = result.mid(4); // Strip "kde-"
 	       return ::locateLocal("apps", ".hidden/"+file);
+		}
 	   else
+		{
+			QString file = result.mid(22); // Strip "kde-"
 		  return ::locateLocal("xdgdata-apps", "Mandrakelinux/.hidden/"+file);
+		}
    }
 }