|
|
@ -680,8 +680,8 @@ KService::Ptr KService::serviceByDesktopPath( const TQString& _name )
|
|
|
|
KService::Ptr KService::serviceByDesktopName( const TQString& _name )
|
|
|
|
KService::Ptr KService::serviceByDesktopName( const TQString& _name )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() );
|
|
|
|
KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() );
|
|
|
|
if (!s && !_name.startsWith("kde-"))
|
|
|
|
if (!s && !_name.startsWith("tde-"))
|
|
|
|
s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() );
|
|
|
|
s = KServiceFactory::self()->findServiceByDesktopName( "tde-"+_name.lower() );
|
|
|
|
return KService::Ptr( s );
|
|
|
|
return KService::Ptr( s );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -866,7 +866,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQString base = suggestedName;
|
|
|
|
TQString base = suggestedName;
|
|
|
|
if (!showInMenu)
|
|
|
|
if (!showInMenu)
|
|
|
|
base.prepend("kde-");
|
|
|
|
base.prepend("tde-");
|
|
|
|
|
|
|
|
|
|
|
|
TQString result;
|
|
|
|
TQString result;
|
|
|
|
for(int i = 1; true; i++)
|
|
|
|
for(int i = 1; true; i++)
|
|
|
@ -891,7 +891,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQString file = result.mid(4); // Strip "kde-"
|
|
|
|
TQString file = result.mid(4); // Strip "tde-"
|
|
|
|
if (!locate("apps", ".hidden/"+file).isEmpty())
|
|
|
|
if (!locate("apps", ".hidden/"+file).isEmpty())
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -907,7 +907,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQString file = result.mid(4); // Strip "kde-"
|
|
|
|
TQString file = result.mid(4); // Strip "tde-"
|
|
|
|
return ::locateLocal("apps", ".hidden/"+file);
|
|
|
|
return ::locateLocal("apps", ".hidden/"+file);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|