summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-04-04 00:43:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-04-04 00:43:23 +0900
commit9cd27dbaa3e866ab5befdbcaadddf13b34e7b0bf (patch)
treef382b13f2852fe82e04528da551791de19083c02
parent55b56c2e5010ffde0673d4a988c451be390fd817 (diff)
downloadtdelibs-9cd27dbaa3e866ab5befdbcaadddf13b34e7b0bf.tar.gz
tdelibs-9cd27dbaa3e866ab5befdbcaadddf13b34e7b0bf.zip
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>
-rw-r--r--kded/vfolder_menu.cpp6
-rw-r--r--tdecmshell/main.cpp4
-rw-r--r--tdeio/tdeio/kservice.cpp10
3 files changed, 10 insertions, 10 deletions
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index 408c6af9a..2e04965ea 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -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)$");
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 20ef629d9..a99c4b545 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -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 ))
{
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index c097146a3..05cf554c0 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -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);
}
}