summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 06:55:59 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-16 06:55:59 +0000
commita81880a78a60da19ad8a441a0688d00b68c7fc35 (patch)
tree4314711c2dcf7f3be91a3931cf40af5bdb5e7fbb
parent70e0afa6f0e381e80e49b43193bf7edefaaaebd5 (diff)
downloadtdebase-a81880a78a60da19ad8a441a0688d00b68c7fc35.tar.gz
tdebase-a81880a78a60da19ad8a441a0688d00b68c7fc35.zip
Changed default wallpaper (bugfix; the green curtain was so ugly it would drive users away...)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1175921 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdm/kfrontend/genkdmconf.c4
-rw-r--r--kpersonalizer/keyecandypage.cpp2
-rw-r--r--startkde18
3 files changed, 12 insertions, 12 deletions
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 78e2d1c7f..f0981afe8 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=green_curtain.jpg\n"
+"Wallpaper=isadora.png\n"
"WallpaperList=\n"
"WallpaperMode=Scaled\n";
@@ -1513,7 +1513,7 @@ edit_startup( File *file )
"test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
chg1 = 1;
if (oldver < 0x0203) {
- chg2 =
+ chg2 =
#ifdef _AIX
delstr( file, "\n"
"# We create a pseudodevice for finger. (host:0 becomes [kx]dm/host_0)\n" );
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index ea1099cbd..bb76455b4 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -45,7 +45,7 @@
#include "ksysinfo.h"
#include "keyecandypage.h"
-#define DEFAULT_WALLPAPER "green_curtain.jpg"
+#define DEFAULT_WALLPAPER "isadora.png"
KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
diff --git a/startkde b/startkde
index c0905a88d..438f49b68 100644
--- a/startkde
+++ b/startkde
@@ -25,7 +25,7 @@ fi
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE
-# Check if prelinking is enabled. If so, exporting KDE_IS_PRELINKED improves
+# Check if prelinking is enabled. If so, exporting KDE_IS_PRELINKED improves
# loading KDE.
if test -f /etc/default/prelink; then
. /etc/default/prelink
@@ -94,7 +94,7 @@ fi
if [ ! -e $kdehome/share/config/kdesktoprc ]; then
cat >$kdehome/share/config/kdesktoprc <<EOF
[Desktop0]
-Wallpaper=green_curtain.jpg
+Wallpaper=isadora.png
WallpaperMode=Scaled
EOF
fi
@@ -164,9 +164,9 @@ unset DESKTOP_LOCKED # Don't want it in the environment
# with cold caches). Makes the splash appear sooner.
# If kpersonalizer needs to be run splash will be started only later.
if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
- case "$ksplashrc_ksplash_theme" in
+ case "$ksplashrc_ksplash_theme" in
Simple)
- ksplashsimple
+ ksplashsimple
;;
*)
;;
@@ -378,12 +378,12 @@ fi
if test -z "$dl"; then
# the splashscreen and progress indicator
- case "$ksplashrc_ksplash_theme" in
+ case "$ksplashrc_ksplash_theme" in
None)
;; # nothing
Simple)
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
- ksplashsimple
+ ksplashsimple
fi # otherwise started earlier
;;
*)
@@ -441,11 +441,11 @@ fi
# if KDEWM is not set, ksmserver will ensure kwin is started.
# kwrapper is used to reduce startup time and memory usage
# kwrapper does not return usefull error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be
-# started, any problems thereafter, e.g. ksmserver failing to initialize,
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
# will remain undetected.
test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-kwrapper ksmserver $KDEWM
+kwrapper ksmserver $KDEWM
if test $? -eq 255; then
# Startup error
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2