Update XDG information in support of bug report 892.

8 files changed, 25 insertions, 25 deletions

diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index 00b178ef4..5ceb12582 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -4,10 +4,10 @@ Icon=komposer
 Type=Application
 Terminal=false
 
-X-KDE-ModuleType=Library
-X-KDE-Library=komposer
-X-KDE-FactoryName=komposerconfig
-X-KDE-HasReadOnlyMode=false
+X-TDE-ModuleType=Library
+X-TDE-Library=komposer
+X-TDE-FactoryName=komposerconfig
+X-TDE-HasReadOnlyMode=false
 
 Name=Komposer
 Name[cy]=Kyfansoddydd
diff --git a/libtdepim/komposer/core/komposereditor.desktop b/libtdepim/komposer/core/komposereditor.desktop
index fd1c1341e..9d5347af7 100644
--- a/libtdepim/komposer/core/komposereditor.desktop
+++ b/libtdepim/komposer/core/komposereditor.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Komposer/Editor
-X-KDE-Derived=Komposer/Plugin
+X-TDE-ServiceType=Komposer/Editor
+X-TDE-Derived=Komposer/Plugin
 Comment=Komposer Editor
 Comment[af]=Komposer Redigeerder
 Comment[bg]=Писане на форматиран текст
diff --git a/libtdepim/komposer/core/komposerplugin.desktop b/libtdepim/komposer/core/komposerplugin.desktop
index b398e1c67..39dfdb6c2 100644
--- a/libtdepim/komposer/core/komposerplugin.desktop
+++ b/libtdepim/komposer/core/komposerplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Komposer/Plugin
-X-KDE-Derived=KPluginInfo
+X-TDE-ServiceType=Komposer/Plugin
+X-TDE-Derived=KPluginInfo
 Name=Komposer Plugin
 Name[af]=Komposer inprop module
 Name[bg]=Приставка за Komposer
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2a55d7349..1a64a6753 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -311,7 +311,7 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
   int error = 0;
   Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>(
     TQString::fromLatin1( "Komposer/Plugin" ),
-    TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+    TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
     this, 0, TQStringList(), &error );
 
   if ( plugin ) {
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 38895f7b6..442914508 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -69,7 +69,7 @@ namespace Komposer
                                                = TQString() ) const;
 
     /**
-     * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name
+     * @brief Search by plugin name. This is the key used as X-TDE-PluginInfo-Name
      * in the .desktop file, e.g. "komposer_attachment"
      *
      * @return The @ref Plugin object found by the search, or a null
@@ -135,7 +135,7 @@ namespace Komposer
      * config file.
      *
      * @param name is the name of the plugin as it is listed in the .desktop
-     * file in the X-KDE-Library field.
+     * file in the X-TDE-Library field.
      *
      * Returns false when no appropriate plugin can be found.
      */
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index e3fdc5824..5aed441a9 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -108,7 +108,7 @@ EditorSelection::readConfig()
     if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )
       continue;
 
-    TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString();
+    TQString name = (*it)->property( "X-TDE-KomposerIdentifier" ).toString();
     m_editorsCombo->insertItem( name );
     if ( m_reference.contains( name ) )
       m_editorsCombo->setCurrentItem( i );
@@ -118,7 +118,7 @@ EditorSelection::readConfig()
 void EditorSelection::writeConfig()
 {
   m_reference =  m_services[ m_editorsCombo->currentText()]->
-                 property( "X-KDE-KomposerIdentifier" ).toString();
+                 property( "X-TDE-KomposerIdentifier" ).toString();
 }
 
 void
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.desktop b/libtdepim/komposer/plugins/default/defaulteditor.desktop
index 910f7d89c..fba95cff6 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.desktop
+++ b/libtdepim/komposer/plugins/default/defaulteditor.desktop
@@ -3,19 +3,19 @@ Type=Service
 Icon=editor
 ServiceTypes=Komposer/Editor
 
-X-KDE-Library=libkomposer_defaulteditor
+X-TDE-Library=libkomposer_defaulteditor
 X-Komposer-Version=1
 X-Komposer-Weight=10
 
-X-KDE-PluginInfo-Author=Zack Rusin
-X-KDE-PluginInfo-Email=zack@kde.org
-X-KDE-PluginInfo-Name=komposer_defaulteditor
-X-KDE-PluginInfo-Version=0.0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-Category=Editors
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Author=Zack Rusin
+X-TDE-PluginInfo-Email=zack@kde.org
+X-TDE-PluginInfo-Name=komposer_defaulteditor
+X-TDE-PluginInfo-Version=0.0.1
+X-TDE-PluginInfo-Website=http://www.kde.org
+X-TDE-PluginInfo-Category=Editors
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 Name=Komposer Editor
 Name[af]=Komposer Redigeerder
 Name[bg]=Редактор за Komposer
diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp
index 60a925efa..7bf768fda 100644
--- a/libtdepim/pluginloaderbase.cpp
+++ b/libtdepim/pluginloaderbase.cpp
@@ -80,9 +80,9 @@ namespace KPIM {
 	  continue;
 	}
 
-	const TQString library = config.readEntry( "X-KDE-Library" );
+	const TQString library = config.readEntry( "X-TDE-Library" );
 	if ( library.isEmpty() ) {
-	  warning() << "missing or empty [Plugin]X-KDE-Library value in \""
+	  warning() << "missing or empty [Plugin]X-TDE-Library value in \""
 		    << *it << "\" - skipping" << endl;
 	  continue;
 	}