From 26f2a2855f43cf5d8516b110149247af7b1b3fb7 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 2 Jun 2008 23:52:06 +0000
Subject: * reorganized the themes-folders of the desktop-plugin as discussed
 with Michael   recently: now it's kdm/<theme> and gdm/<theme> instead of
 <theme>/kdm and   <theme>/gdm, as that makes handling of GDM less cumbersome
 * renamed actual theme description files to theme.xml instead of being  
 named like the theme (in this case: openslx.xml) Tested with GDM and KDM on
 SUSE-10.2

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1838 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm')

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index 2777dc13..dbd12416 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -152,9 +152,9 @@ sub setupGDMScript
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
         if [ -n "\$desktop_theme" ]; then
-          thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/gdm
+          thdir=/opt/openslx/plugin-repo/desktop/themes/gdm
           theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$theme/\$theme.xml ]; then
+          if [ -e /mnt\$thdir/\$theme/theme.xml ]; then
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
@@ -298,10 +298,10 @@ sub setupKDMScript
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
         if [ -n "\$desktop_theme" ]; then
-          thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/kdm
           theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$theme.xml ]; then
-            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thdir," \\
+          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," \\
               /mnt$configFile
             sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseTheme=true," \\
               /mnt$configFile
-- 
cgit v1.2.3-55-g7522