Merge lp:~debfx/kdebase-workspace/powerdevil-patches into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

[Felix Geyer]

* Add kubuntu_119_powerdevil_fix_suspend_twice.diff, fixes PowerDevil
  suspending twice when system is idle.
  http://bugs.kde.org/221637
* Add kubuntu_120_powerdevil_reset_status_after_idle.diff, fixes PowerDevil
  only suspending once per session.
  http://bugs.kde.org/221648

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-13 14:22:29 +0000
+++ debian/changelog	2010-04-13 17:28:19 +0000
@@ -1,3 +1,14 @@
+kdebase-workspace (4:4.4.2-0ubuntu12) UNRELEASED; urgency=low
+
+  * Add kubuntu_119_powerdevil_fix_suspend_twice.diff, fixes PowerDevil
+    suspending twice when system is idle.
+    http://bugs.kde.org/221637
+  * Add kubuntu_120_powerdevil_reset_status_after_idle.diff, fixes PowerDevil
+    only suspending once per session.
+    http://bugs.kde.org/221648
+
+ -- Felix Geyer <[e-mail]>  Tue, 13 Apr 2010 17:52:38 +0200
+
 kdebase-workspace (4:4.4.2-0ubuntu11) lucid; urgency=low
 
   [ Harald Sitter ]

=== added file 'debian/patches/kubuntu_119_powerdevil_fix_suspend_twice.diff'
--- debian/patches/kubuntu_119_powerdevil_fix_suspend_twice.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_119_powerdevil_fix_suspend_twice.diff	2010-04-13 17:28:19 +0000
@@ -0,0 +1,13 @@
+--- kdebase-workspace-4.4.2.orig/powerdevil/daemon/PowerDevilDaemon.cpp
++++ kdebase-workspace-4.4.2/powerdevil/daemon/PowerDevilDaemon.cpp
+@@ -985,10 +987,6 @@
+ void PowerDevilDaemon::emitNotification(const QString &evid, const QString &message,
+                                         const char *slot, const QString &iconname)
+ {
+-    if (slot) {
+-        QTimer::singleShot(0, this, slot);
+-    }
+-
+     if (!slot) {
+         KNotification::event(evid, message, KIcon(iconname).pixmap(20, 20),
+                              0, KNotification::CloseOnTimeout, d->applicationData);

=== added file 'debian/patches/kubuntu_120_powerdevil_reset_status_after_idle.diff'
--- debian/patches/kubuntu_120_powerdevil_reset_status_after_idle.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_120_powerdevil_reset_status_after_idle.diff	2010-04-13 17:28:19 +0000
@@ -0,0 +1,11 @@
+--- kdebase-workspace-4.4.2.orig/powerdevil/daemon/PowerDevilDaemon.cpp
++++ kdebase-workspace-4.4.2/powerdevil/daemon/PowerDevilDaemon.cpp
+@@ -280,6 +280,8 @@
+     }
+ 
+     Solid::Control::PowerManager::setBrightness(d->brightness);
++
++    d->status = NoAction;
+ }
+ 
+ void PowerDevilDaemon::refreshStatus()

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-04-13 13:57:22 +0000
+++ debian/patches/series	2010-04-13 17:28:19 +0000
@@ -41,3 +41,5 @@
 kubuntu_117_randr_fix_revert.diff
 kubuntu_118_netbook_activitybar.diff
 kubuntu_119_krandrtray_radio_menu_items.diff
+kubuntu_119_powerdevil_fix_suspend_twice.diff
+kubuntu_120_powerdevil_reset_status_after_idle.diff