Browse Source

Fixed tde branding of services in tdebuildsycoca. This was creating old

kde-* entries in profilerc when updating file type preferences. This
relates to bug 3083.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/79/head
Michele Calgaro 6 months ago
parent
commit
9cd27dbaa3
Signed by: MicheleC GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 10 additions and 10 deletions
  1. +3
    -3
      kded/vfolder_menu.cpp
  2. +2
    -2
      tdecmshell/main.cpp
  3. +5
    -5
      tdeio/tdeio/kservice.cpp

+ 3
- 3
kded/vfolder_menu.cpp View File

@@ -775,8 +775,8 @@ VFolderMenu::locateMenuFile(const TQString &fileName)
TQString result;

//TQString xdgMenuPrefix = TQString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
// hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
TQString xdgMenuPrefix = "kde-";
// hardcode xdgMenuPrefix to "tde-" string until proper upstream fix
TQString xdgMenuPrefix = "tde-";
if (!xdgMenuPrefix.isEmpty())
{
TQFileInfo fileInfo(fileName);
@@ -1032,7 +1032,7 @@ VFolderMenu::processKDELegacyDirs()
kdDebug(7021) << "processKDELegacyDirs()" << endl;

TQDict<KService> items;
TQString prefix = "kde-";
TQString prefix = "tde-";

TQStringList relFiles;
TQRegExp files("\\.(desktop|kdelnk)$");


+ 2
- 2
tdecmshell/main.cpp View File

@@ -103,8 +103,8 @@ static KService::Ptr locateModule(const TQCString& module)
}

// avoid finding random non-TDE applications
if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
return locateModule( "kde-" + module );
if ( module.left( 4 ) != "tde-" && service->library().isEmpty() )
return locateModule( "tde-" + module );

if(!TDECModuleLoader::testModule( module ))
{


+ 5
- 5
tdeio/tdeio/kservice.cpp View File

@@ -680,8 +680,8 @@ KService::Ptr KService::serviceByDesktopPath( const TQString& _name )
KService::Ptr KService::serviceByDesktopName( const TQString& _name )
{
KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() );
if (!s && !_name.startsWith("kde-"))
s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() );
if (!s && !_name.startsWith("tde-"))
s = KServiceFactory::self()->findServiceByDesktopName( "tde-"+_name.lower() );
return KService::Ptr( s );
}

@@ -866,7 +866,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
{
TQString base = suggestedName;
if (!showInMenu)
base.prepend("kde-");
base.prepend("tde-");

TQString result;
for(int i = 1; true; i++)
@@ -891,7 +891,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
}
else
{
TQString file = result.mid(4); // Strip "kde-"
TQString file = result.mid(4); // Strip "tde-"
if (!locate("apps", ".hidden/"+file).isEmpty())
continue;
}
@@ -907,7 +907,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName
}
else
{
TQString file = result.mid(4); // Strip "kde-"
TQString file = result.mid(4); // Strip "tde-"
return ::locateLocal("apps", ".hidden/"+file);
}
}


Loading…
Cancel
Save