From 052bf23d0cd83b36e227b760f9202c27e863ab26 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 9 Sep 2010 03:01:37 +0000
Subject: [PATCH] * Added thee new wallpapers   Aghi   Stripes   World Desktop
 * * KDM now uses the

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173250 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdesktop/krootwm.cc                            | 1 +
 kdm/config.def                                 | 9 +++++----
 kdm/kfrontend/genkdmconf.c                     | 2 +-
 kdm/kfrontend/themes/o2_enterprise/Makefile.am | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index a423471bb..ce8b3597e 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -32,6 +32,7 @@
 #include <dirent.h>
 #include <errno.h>
 
+#include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kpopupmenu.h>
 #include <kapplication.h>
diff --git a/kdm/config.def b/kdm/config.def
index 7bc39b36d..1dfb26ba6 100644
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -1,4 +1,5 @@
 #
+# Copyright 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
 # Copyright 2004-2005 Oswald Buddenhagen <ossi@kde.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
@@ -2613,18 +2614,18 @@ Description:
 
 Key: UseTheme
 Type: bool
-Default: false
+Default: true
 User: greeter
-Instance: #*/true
+Instance: */true
 Comment: &
 Description:
  Whether the greeter should be themed.
 
 Key: Theme
 Type: string
-Default: ""
+Default: KDMDATA "/themes/o2_enterprise"
 User: greeter
-Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
+Instance: */KDMDATA "/themes/o2_enterprise"
 Comment: &
 Description:
  The theme to use for the greeter. Can point to either a directory or an XML
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 631561d17..1dc85a3bc 100644
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
@@ -694,7 +694,7 @@ static const char def_background[] =
 "Program=\n"
 "ReverseBlending=false\n"
 "UseSHM=false\n"
-"Wallpaper=default_blue.jpg\n"
+"Wallpaper=stripes.jpg\n"
 "WallpaperList=\n"
 "WallpaperMode=Scaled\n";
 
diff --git a/kdm/kfrontend/themes/o2_enterprise/Makefile.am b/kdm/kfrontend/themes/o2_enterprise/Makefile.am
index 52ce6c98e..0fb30e256 100644
--- a/kdm/kfrontend/themes/o2_enterprise/Makefile.am
+++ b/kdm/kfrontend/themes/o2_enterprise/Makefile.am
@@ -1,7 +1,7 @@
 o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise
 o2_enterprise_DATA = \
-	background.desktop \
-	dialog.png \
+	background.jpg \
+	Dialog.png \
 	enter_normal.png \
 	enter_over.png \
 	enter_pressed.png \