Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Thu Nov 20 15:36:10 CET 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-11-17 17:06:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-11-20 15:33:52.628892000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 20 11:09:08 CET 2008 - llunak@suse.cz
+
+- make also logout dialog use suspend code that lock (bnc#326848)
+
+-------------------------------------------------------------------
+Wed Nov 19 19:16:10 CET 2008 - llunak@suse.cz
+
+- disable plasma backported suspend code (bnc#326848, bnc#444793)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
calling whatdependson for head-i586
New:
----
suspend-lock.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.mF7990/_old 2008-11-20 15:34:03.000000000 +0100
+++ /var/tmp/diff_new_pack.mF7990/_new 2008-11-20 15:34:03.000000000 +0100
@@ -29,7 +29,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.1.3
-Release: 7
+Release: 8
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -66,6 +66,10 @@
/usr/share/wallpapers
%changelog
+* Thu Nov 20 2008 llunak@suse.cz
+- make also logout dialog use suspend code that lock (bnc#326848)
+* Wed Nov 19 2008 llunak@suse.cz
+- disable plasma backported suspend code (bnc#326848, bnc#444793)
* Fri Nov 14 2008 dmueller@suse.de
- add missing quoting (bnc#444742)
- fix greeter plugin splitting so that kde3 only installation
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.mF7990/_old 2008-11-20 15:34:03.000000000 +0100
+++ /var/tmp/diff_new_pack.mF7990/_new 2008-11-20 15:34:03.000000000 +0100
@@ -37,7 +37,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.1.3
-Release: 7
+Release: 8
Source0: kdebase-workspace-%version.tar.bz2
Source1: rediff-plasma.sh
Source2: titlebar_decor.png
@@ -84,6 +84,7 @@
Patch94: systemsettings-root-kcm.diff
Patch95: taskbarthumbnail.diff
Patch96: kdm-session-button.diff
+Patch97: suspend-lock.diff
Requires: kde4-kgreeter-plugins = %version
%kde4_runtime_requires
Requires: powerdevil
@@ -152,6 +153,7 @@
%patch94
%patch95
%patch96
+%patch97
cp %{SOURCE3} kwin/effects/data/cubecap.png
%build
@@ -791,6 +793,10 @@
/usr/share/kde4/servicetypes/plasma-wallpaper.desktop
%changelog
+* Thu Nov 20 2008 llunak@suse.cz
+- make also logout dialog use suspend code that lock (bnc#326848)
+* Wed Nov 19 2008 llunak@suse.cz
+- disable plasma backported suspend code (bnc#326848, bnc#444793)
* Fri Nov 14 2008 dmueller@suse.de
- add missing quoting (bnc#444742)
- fix greeter plugin splitting so that kde3 only installation
++++++ plasma.diff ++++++
--- /var/tmp/diff_new_pack.mF7990/_old 2008-11-20 15:34:08.000000000 +0100
+++ /var/tmp/diff_new_pack.mF7990/_new 2008-11-20 15:34:08.000000000 +0100
@@ -18467,7 +18467,7 @@
+ QStandardItem *standbyOption = createStandardItem("leave:/standby");
+ systemOptions->appendRow(standbyOption);
+ }
-+
++#if 0
+ if( spdMethods & Solid::Control::PowerManager::ToRam ) {
+ QStandardItem *suspendramOption = createStandardItem("leave:/suspendram");
+ systemOptions->appendRow(suspendramOption);
@@ -18477,7 +18477,7 @@
+ QStandardItem *suspenddiskOption = createStandardItem("leave:/suspenddisk");
+ systemOptions->appendRow(suspenddiskOption);
+ }
-+
++#endif
// Shutdown
QStandardItem *shutDownOption = createStandardItem("leave:/shutdown");
systemOptions->appendRow(shutDownOption);
@@ -25303,3 +25303,20 @@
add_subdirectory(containments)
add_subdirectory(plasma)
+add_subdirectory(wallpapers)
+--- applets/kickoff/core/leavemodel.cpp
++++ applets/kickoff/core/leavemodel.cpp
+@@ -60,12 +62,12 @@
+ else if (basename == "sleep") {
+ item->setText(i18n("Sleep"));
+ item->setIcon(KIcon("system-suspend"));
+- item->setData(url,Kickoff::SubTitleRole);
++ item->setData(i18n("Suspend to RAM"),Kickoff::SubTitleRole);
+ }
+ else if (basename == "hibernate") {
+ item->setText(i18n("Hibernate"));
+ item->setIcon(KIcon("system-suspend-hibernate"));
+- item->setData(url,Kickoff::SubTitleRole);
++ item->setData(i18n("Suspend to Disk"),Kickoff::SubTitleRole);
+ }
+ else if (basename == "shutdown") {
+ item->setText(i18n("Shutdown"));
++++++ suspend-lock.diff ++++++
Subject: Use Solid suspend method that also locks screen
From: Lubos Lunak
Bug: bnc#326848
Patch-upstream: No
I don't understand what the difference between the two Solid suspend methods
is (or even why there are two), but the one ksmserver in 4.1 uses does not
lock the screen, and this one does.
--- ksmserver/shutdowndlg.cpp.sav 2008-11-14 16:29:14.000000000 +0100
+++ ksmserver/shutdowndlg.cpp 2008-11-20 10:54:40.000000000 +0100
@@ -43,6 +43,7 @@
#include