rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch, NONE, 1.1 kdebase-workspace.spec, 1.75, 1.76

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch 
Log Message:
Sync from F-9:

* Fri May 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-20
- Requires: kdebase , so it doesn't go missing on upgrades from kde3 (#444928)

* Mon Apr 28 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.3-19
- #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves"

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

--- NEW FILE kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch ---
--- plasma/containments/desktop/backgrounddialog.cpp	2008/04/27 10:39:39	801650
+++ plasma/containments/desktop/backgrounddialog.cpp	2008/04/27 10:44:30	801651
@@ -614,12 +614,18 @@
     }
     m_selected = config.readEntry("selected", QStringList());
     m_model->reload(m_selected);
+
+    KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc");
+    KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+    QString defaultPath = group.readEntry("wallpaper", "EOS/contents/images/1920x1200.jpg");
+
     QString currentPath = config.readEntry("wallpaper",
-            KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg"));
+            KStandardDirs::locate("wallpaper", defaultPath));
 
     kDebug() << "Default would be" << KStandardDirs::locate("wallpaper", "EOS/contents/images/1920x1200.jpg");
     kDebug() << "but we're loading" << currentPath << "instead";
 
+    m_model->addBackground(currentPath);
     int index = m_model->indexOf(currentPath);
     if (index != -1) {
         m_view->setCurrentIndex(index);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdebase-workspace.spec	27 Apr 2008 03:52:28 -0000	1.75
+++ kdebase-workspace.spec	6 May 2008 21:15:02 -0000	1.76
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 18%{?dist}
+Release: 20%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -48,6 +48,9 @@
 # http://websvn.kde.org/?view=rev&revision=794496
 # don't show "Zoom Out" toolbox action (not working in 4.0)
 Patch202: kdebase-workspace-4.0.3-rh#443610.patch
+# #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves"
+#Â http://websvn.kde.org/?view=rev&revision=801651
+Patch203: kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -55,6 +58,8 @@
 
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
+# so kdebase doesn't get lost on kde3->kde4 upgrade (#444928)
+Requires: kdebase4
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -151,6 +156,7 @@
 %patch200 -p0 -b .plasma-default-wallpaper
 %patch201 -p1 -b .kde#158301
 %patch202 -p1 -b .rh#443610
+%patch203 -p0 -b .plasma-default-wallpaper-config
 
 %build
 
@@ -269,6 +275,12 @@
 
 
 %changelog
+* Fri May 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-20
+- Requires: kdebase , so it doesn't go missing on upgrades from kde3 (#444928)
+
+* Mon Apr 28 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.3-19
+- #444141: Initial wallpaper chooser has "EOS" preselected but wallpaper is "Fedora Waves"
+
 * Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-18
 - don't show "Zoom Out" toolbox action (#443610, patch from openSUSE branch)