rpms/kdebase-workspace/devel kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch, NONE, 1.1 kdebase-workspace-4.0.84-plasma-default-wallpaper.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdebase-workspace.spec, 1.91, 1.92 sources, 1.14, 1.15 kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch, 1.1, NONE kdebase-workspace-4.0.72-plasma-default-wallpaper.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Jun 27 16:56:15 UTC 2008 

Author: rdieter

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

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch 
	kdebase-workspace-4.0.84-plasma-default-wallpaper.patch 
Removed Files:
	kdebase-workspace-4.0.3-plasma-default-wallpaper-config.patch 
	kdebase-workspace-4.0.72-plasma-default-wallpaper.patch 
Log Message:
* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
- 4.0.84


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

--- NEW FILE kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch ---
diff -up kdebase-workspace-4.0.84/plasma/containments/desktop/backgrounddialog.cpp.plasma-default-wallpaper-config kdebase-workspace-4.0.84/plasma/containments/desktop/backgrounddialog.cpp
--- kdebase-workspace-4.0.84/plasma/containments/desktop/backgrounddialog.cpp.plasma-default-wallpaper-config	2008-06-25 02:53:19.000000000 -0500
+++ kdebase-workspace-4.0.84/plasma/containments/desktop/backgrounddialog.cpp	2008-06-27 11:53:08.000000000 -0500
@@ -635,12 +635,18 @@ void BackgroundDialog::reloadConfig(cons
     }
     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", "Blue_Curl/contents/images/1920x1200.jpg");
+
     QString currentPath = config.readEntry("wallpaper",
-            KStandardDirs::locate("wallpaper", "Blue_Curl/contents/images/1920x1200.jpg"));
+            KStandardDirs::locate("wallpaper", defaultPath));    
 
     kDebug() << "Default would be" << KStandardDirs::locate("wallpaper", "Blue_Curl/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);

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

--- NEW FILE kdebase-workspace-4.0.84-plasma-default-wallpaper.patch ---
diff -up kdebase-workspace-4.0.84/plasma/containments/desktop/desktop.cpp.plasma-default-wallpaper kdebase-workspace-4.0.84/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.0.84/plasma/containments/desktop/desktop.cpp.plasma-default-wallpaper	2008-06-27 11:46:31.000000000 -0500
+++ kdebase-workspace-4.0.84/plasma/containments/desktop/desktop.cpp	2008-06-27 11:48:21.000000000 -0500
@@ -248,7 +248,9 @@ void DefaultDesktop::reloadConfig(bool s
 void DefaultDesktop::updateBackground()
 {
     if (m_wallpaperPath.isEmpty() && m_backgroundMode != BackgroundDialog::kNoBackground) {
-        QString defaultPath = QString("Blue_Curl/contents/images/%1x%2.jpg");
+        KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc");
+        KConfigGroup group = KConfigGroup(config, "Defaults");
+        QString defaultPath = group.readEntry("wallpaper", "Blue_Curl/contents/images/%1x%2.jpg");
 
         QString testPath = defaultPath.arg(geometry().width()).arg(geometry().height());
         m_wallpaperPath = KStandardDirs::locate("wallpaper", testPath);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	19 Jun 2008 09:50:27 -0000	1.12
+++ .cvsignore	27 Jun 2008 16:55:31 -0000	1.13
@@ -1,2 +1 @@
-kdebase-workspace-4.0.82.tar.bz2
-kdebase-workspace-4.0.83.tar.bz2
+kdebase-workspace-4.0.84.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kdebase-workspace.spec	27 Jun 2008 07:54:41 -0000	1.91
+++ kdebase-workspace.spec	27 Jun 2008 16:55:31 -0000	1.92
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.0.83
+Version: 4.0.84
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -26,14 +26,14 @@
 # plasma-4.0-openSUSE patches:
 # http://websvn.kde.org/?view=rev&revision=795438
 # allows to define a default wallpaper via plasmarc:wallpaper
-Patch200: kdebase-workspace-4.0.72-plasma-default-wallpaper.patch
+Patch200: kdebase-workspace-4.0.84-plasma-default-wallpaper.patch
 # http://websvn.kde.org/?view=rev&revision=791852
 # from Plasma review board: http://mattr.info/r/261/
 # allows moving plasmoids on panels (#439587, kde#154119, kde#158301)
 Patch201: kdebase-workspace-4.0.83-kde#154119.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
+Patch203: kdebase-workspace-4.0.84-plasma-default-wallpaper-config.patch
 Patch204: kdebase-workspace-4.0.4-kickoff-suspend.patch
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -148,7 +148,7 @@
 # plasma-4.0-openSUSE patches:
 %patch200 -p1 -b .plasma-default-wallpaper
 %patch201 -p1 -b .kde#154119
-%patch203 -p0 -b .plasma-default-wallpaper-config
+%patch203 -p1 -b .plasma-default-wallpaper-config
 %patch204 -p1 -b .kickoff-suspend
 
 %build
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
+- 4.0.84
+
 * Fri Jun 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
 - port and apply kde#154119/kde#158301 patch for moving icons on panel (#439587)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Jun 2008 09:50:27 -0000	1.14
+++ sources	27 Jun 2008 16:55:31 -0000	1.15
@@ -1 +1 @@
-f7e81d183d10418c5c7dc6a757b9d172  kdebase-workspace-4.0.83.tar.bz2
+33a820e1f71135801ea077459f7eb249  kdebase-workspace-4.0.84.tar.bz2


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


--- kdebase-workspace-4.0.72-plasma-default-wallpaper.patch DELETED ---

More information about the fedora-extras-commits mailing list