* Synchronized default wallpaper across kdm, kdmtheme, and first login session.

* Removed Kubuntu-specific gtk engine startup and replaced with generic gtk engine startup


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173274 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 3 deletions

diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 3349ab4c3..d719a3501 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -45,6 +45,8 @@
 #include "ksysinfo.h"
 #include "keyecandypage.h"
 
+#define DEFAULT_WALLPAPER "stripes.jpg"
+
 KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
 
 	kwinconf = new KConfig("kwinrc", false, true);
@@ -240,14 +242,14 @@ void KEyeCandyPage::enableDesktopWallpaper(bool enable, bool user){
 	kdesktopconf->setGroup("Desktop0");
 
 	if( st_UserWallpaper.WallpaperMode == "NoWallpaper")
-	deskbgimage="KDE34.png";
+		deskbgimage=DEFAULT_WALLPAPER;
 
 	if(enable && !user){
 		// if the user has a different mode than the default of NoMulti, we don't change anyting on that.
 		if( st_UserWallpaper.MultiWallpaperMode == "NoMulti" )
 			kdesktopconf->writeEntry("MultiWallpaperMode", "NoMulti");
 		// if the wallpaper is the new default one, set mode to scaled to leave user settings untouched
-		if( deskbgimage == "KDE34.png"){
+		if( deskbgimage == DEFAULT_WALLPAPER){
 			kdesktopconf->writeEntry("WallpaperMode", "Scaled");
 			//here we change the kdesktop font color to white as it fits better
 			// to the KDE34png.png gray background
@@ -689,7 +691,7 @@ void KEyeCandyPage::getUserDefaults(){
 	st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
 	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
 	st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");
-	deskbgimage = kdesktopconf->readPathEntry("Wallpaper", "KDE34.png");
+	deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER);
 	// Wallpaper-User-Defaults (END)
 
 	KGlobal::config()->setGroup("KDE");