From 838998e086bdc63615a00a2edf86761cf341ba3b Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 8 Jun 2012 16:09:06 -0500
Subject: Update XDG information in support of bug report 892.

---
 app_templates/kcontrol_module/src/kcontrol_module.desktop | 10 +++++-----
 doc/en/index.docbook                                      |  4 ++--
 src/kdedistutils.py                                       | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app_templates/kcontrol_module/src/kcontrol_module.desktop b/app_templates/kcontrol_module/src/kcontrol_module.desktop
index f0381c5..4487e8a 100644
--- a/app_templates/kcontrol_module/src/kcontrol_module.desktop
+++ b/app_templates/kcontrol_module/src/kcontrol_module.desktop
@@ -6,10 +6,10 @@ Comment=Kcontrol module template
 Comment[en]=Kcontrol module template
 Comment[en_GB]=Kcontrol module template
 Icon=daemons.png
-X-KDE-ModuleType=Library
-X-KDE-Library=kcontrol_module
-X-KDE-FactoryName=kcontrol_module
-X-KDE-RootOnly=false
+X-TDE-ModuleType=Library
+X-TDE-Library=kcontrol_module
+X-TDE-FactoryName=kcontrol_module
+X-TDE-RootOnly=false
 Type=Application
 Exec=kcmshell kcontrol_module
-Categories=QT;KDE;X-KDE-settings-system;
+Categories=QT;TDE;X-TDE-settings-system;
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index a487e00..a425de2 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -401,7 +401,7 @@ design a KControl module that fits into the rest of KDE.
 <tip>
 <para>
 &appname; typically installs the <literal role="extension">.desktop</literal>
-file into the <filename>/usr/share/applications/kde/</filename> directory.
+file into the <filename>/usr/share/applications/tde/</filename> directory.
 This is normally enough to make the module appear in the TDE Control Center.
 But for some distributions, most notably <ulink url="http://www.mandriva.com/">
 Mandriva</ulink> but probably others too, this isn't enough. Mandriva in
@@ -417,7 +417,7 @@ modules.
 
 <note>
 <para>
-Right now there is no support for "module-testing" or "X-KDE-Test-Module=true"
+Right now there is no support for "module-testing" or "X-TDE-Test-Module=true"
 features in <literal role="extension">.desktop</literal> files.
 </para>
 </note>
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index ea79992..6b28b2b 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -692,7 +692,7 @@ class BuildKControlModule(Command):
                 for line in fhandle.readlines():
                     parts = line.strip().split('=')
                     try:
-                        if parts[0]=="X-KDE-Library":
+                        if parts[0]=="X-TDE-Library":
                             libraryname = parts[1]
                         elif parts[0]=="Exec":
                             shellcmd = parts[1].split()
@@ -701,7 +701,7 @@ class BuildKControlModule(Command):
                                 cmodulecategory = os.path.dirname(modulepath)
                             else:
                                 cmodulecategory = ""
-                        elif parts[0]=="X-KDE-FactoryName":
+                        elif parts[0]=="X-TDE-FactoryName":
                             factoryfunction = 'create_'+parts[1]
                     except IndexError:
                         pass
@@ -711,9 +711,9 @@ class BuildKControlModule(Command):
                 
             # Sanity check.
             if factoryfunction is None:
-                raise SystemExit, "Failed to find factory name (Was there a X-KDE-FactoryName entry in the desktop file?)"
+                raise SystemExit, "Failed to find factory name (Was there a X-TDE-FactoryName entry in the desktop file?)"
             if libraryname is None:
-                raise SystemExit, "Failed to find library name (Was there a X-KDE-Library entry in the desktop file?)"
+                raise SystemExit, "Failed to find library name (Was there a X-TDE-Library entry in the desktop file?)"
             if cmodulecategory is None:
                 raise SystemExit, "Failed to find the kcontrol category name (Was there a Exec entry in the desktop file?)"
             
@@ -1072,7 +1072,7 @@ class InstallKControlModule(Command):
                 for line in fhandle.readlines():
                     parts = line.strip().split('=')
                     try:
-                        if parts[0]=="X-KDE-Library":
+                        if parts[0]=="X-TDE-Library":
                             libraryname = parts[1]
                         elif parts[0]=="Exec":
                             shellcmd = parts[1].split()
@@ -1088,7 +1088,7 @@ class InstallKControlModule(Command):
                 raise SystemExit, "Failed to find kcontrol desktop file: %s" % moduletuple[0]
                 
             if libraryname is None:
-                raise SystemExit, "Failed to find library name (Was there a X-KDE-Library entry in the desktop file?)"
+                raise SystemExit, "Failed to find library name (Was there a X-TDE-Library entry in the desktop file?)"
             if cmodulecategory is None:
                 raise SystemExit, "Failed to find the kcontrol category name (Was there a Exec entry in the desktop file?)"
                 
-- 
cgit v1.2.1