Make kdelibs support X-TDE-* in XDG desktop files

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245191 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 9 insertions, 9 deletions

diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index a8304427c..64932b2a3 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
     {
       // compat mode: assume KIO if not set and it's a KDE app
       TQStringList categories = _service.property("Categories").toStringList();
-      if ( categories.tqfind("KDE") != categories.end() )
+      if (( categories.tqfind("TDE") != categories.end() ) && ( categories.tqfind("KDE") != categories.end() ))
          supportedProtocols.append( "KIO" );
       else { // if no KDE app, be a bit over-generic
          supportedProtocols.append( "http");
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index 36fb0f9fa..471301d79 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -733,7 +733,7 @@ bool KService::noDisplay() const {
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
-     if (!aList.tqcontains("KDE"))
+     if ((!aList.tqcontains("TDE")) && (!aList.tqcontains("KDE")))
         return true;
   }
 
@@ -742,7 +742,7 @@ bool KService::noDisplay() const {
   {
      TQString aValue = it.data().toString();
      TQStringList aList = TQStringList::split(';', aValue);
-     if (aList.tqcontains("KDE"))
+     if ((aList.tqcontains("TDE")) && (aList.tqcontains("KDE")))
         return true;
   }
   
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index 0560d033c..8333e4f1e 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
   TQStringList tmpList;
   if (config.hasKey("OnlyShowIn"))
   {
-     if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+     if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")))
         d->m_bNoDisplay = true;
   }
   if (config.hasKey("NotShowIn"))
   {
-     if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+     if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) && (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
         d->m_bNoDisplay = true;
   }
 
diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc
index bbe13e32f..c71490d60 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/kio/kssl/ksslkeygen.cc
@@ -94,7 +94,7 @@ void KSSLKeyGen::slotGenerate() {
 		return;
 	}
 
-	KProgressDialog *kpd = new KProgressDialog(this, "progress dialog", i18n("KDE"), i18n("Please wait while the encryption keys are generated..."));
+	KProgressDialog *kpd = new KProgressDialog(this, "progress dialog", i18n("TDE"), i18n("Please wait while the encryption keys are generated..."));
 	kpd->progressBar()->setProgress(0);
 	kpd->show();
 	// FIXME - progress dialog won't show this way
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 44fb8af19..2ce91feb3 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1378,10 +1378,10 @@ UIServer* UIServer::createInstance()
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KLocale::setMainCatalogue("kdelibs");
-    //  GS 5/2001 - I changed the name to "KDE" to make it look better
+    //  GS 5/2001 - I changed the name to "TDE" to make it look better
     //              in the titles of dialogs which are displayed.
-    KAboutData aboutdata("kio_uiserver", I18N_NOOP("KDE"),
-                         "0.8", I18N_NOOP("KDE Progress Information UI Server"),
+    KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
+                         "0.8", I18N_NOOP("TDE Progress Information UI Server"),
                          KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
     // Who's the maintainer ? :)
     aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");