rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-plasma-default-wallpaper.patch, NONE, 1.1 kdebase-workspace.spec, 1.66, 1.67

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27211

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-plasma-default-wallpaper.patch 
Log Message:
allow to define a default wallpaper


kdebase-workspace-4.0.3-plasma-default-wallpaper.patch:

--- NEW FILE kdebase-workspace-4.0.3-plasma-default-wallpaper.patch ---
--- plasma/containments/desktop/desktop.cpp	2008/04/10 11:08:34	795437
+++ plasma/containments/desktop/desktop.cpp	2008/04/10 11:09:17	795438
@@ -255,7 +255,9 @@
 void DefaultDesktop::updateBackground()
 {
     if (m_wallpaperPath.isEmpty() && m_backgroundMode != BackgroundDialog::kNoBackground) {
-        QString defaultPath = QString("EOS/contents/images/%1x%2.jpg");
+        KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc");
+        KConfigGroup group = KConfigGroup(config, "Defaults");
+        QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/%1x%2.jpg");
 
         QString testPath = defaultPath.arg(geometry().width()).arg(geometry().height());
         m_wallpaperPath = KStandardDirs::locate("wallpaper", testPath);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdebase-workspace.spec	9 Apr 2008 17:19:27 -0000	1.66
+++ kdebase-workspace.spec	11 Apr 2008 10:17:01 -0000	1.67
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -29,8 +29,9 @@
 # (fixed version of http://websvn.kde.org/?view=rev&revision=790063
 # which was reverted in http://websvn.kde.org/?view=rev&revision=790104)
 Patch101: kdebase-workspace-4.0.3-menu-switch.patch
-
-# upstream patch
+# http://websvn.kde.org/?view=rev&revision=795438
+# allows to define a default wallpaper via plasmarc:wallpaper
+Patch102: kdebase-workspace-4.0.3-plasma-default-wallpaper.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -125,6 +126,7 @@
 # upstream patches
 %patch101 -p1 -b .menu-switch
 %patch100 -p0 -b .kde#155362
+%patch102 -p0 -b .plasma-default-wallpaper
 
 %build
 
@@ -243,6 +245,9 @@
 
 
 %changelog
+* Fri Apr 11 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.3-12
+- allow to define a default wallpaper (plasmarc:wallpaper)
+
 * Wed Apr 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-11
 - read the default KSplash theme from kde-settings in startkde (#441565)