From c0ae884b724298e7726ad4b2ed3f1855a7cb635e Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 26 Aug 2008 18:33:12 +0000
Subject: removed "bug" so that xml file in gdm has to be called theme.xml
 added support for G(K)dmGreeter.desktop files, so that name of xml file can
 be passed over these file instead of kdmrc

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2103 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm                 | 8 ++++----
 .../plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop    | 8 ++++++++
 .../plugins/desktop/themes/kdm/openslx/KdmGreeterTheme.desktop    | 8 ++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100755 os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop
 create mode 100755 os-plugins/plugins/desktop/themes/kdm/openslx/KdmGreeterTheme.desktop

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index a37b42f9..a85329f7 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -154,7 +154,7 @@ sub setupGDMScript
         if [ -n "\$desktop_theme" ]; then
           thdir=/opt/openslx/plugin-repo/desktop/themes/gdm
           theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$theme/theme.xml ]; then
+          if [ -e /mnt\$thdir/\$theme/*.xml ]; then
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
@@ -316,9 +316,9 @@ sub setupKDMScript
         # (otherwise fall back to default theme of vendor-OS)
         if [ -n "\$desktop_theme" ]; then
           theme=\$desktop_theme
-          thfile=/opt/openslx/plugin-repo/desktop/themes/kdm/\$theme/theme.xml
-          if [ -e /mnt\$thfile ]; then
-            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thfile," \\
+          thdir=/opt/openslx/plugin-repo/desktop/themes/kdm/\$theme
+          if [ -e /mnt\$thdir/*.xml ]; then
+            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseTheme=true," \\
               /mnt$configFile
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop
new file mode 100755
index 00000000..da63ec08
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=OpenSLX KDM theme
+Description=KDM Port of Daemonic KDM theme for FreeBSD
+Author=MJanc / KDM by aceph <aceph@ventcore.net>
+Copyright=Creative Commons
+Screenshot=screenshot.png
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/KdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/kdm/openslx/KdmGreeterTheme.desktop
new file mode 100755
index 00000000..da63ec08
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=OpenSLX KDM theme
+Description=KDM Port of Daemonic KDM theme for FreeBSD
+Author=MJanc / KDM by aceph <aceph@ventcore.net>
+Copyright=Creative Commons
+Screenshot=screenshot.png
-- 
cgit v1.2.3-55-g7522