[kde-workspace] update Powerdevil login1 patch

[Lukas Tinkl]

commit 6a91226747dc8b51f71996d3f6dc3b98b7fadcdf
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Wed Jan 30 13:49:52 2013 +0100

    update Powerdevil login1 patch

 ...orkspace-4.9.98-powerdevil_systemd_login1.patch |   17 +++++++++--------
 kde-workspace.spec                                 |    5 ++++-
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/kde-workspace-4.9.98-powerdevil_systemd_login1.patch b/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
index ee3e3b6..da645bf 100644
--- a/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
+++ b/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
@@ -206,7 +206,7 @@ index ba942bd..ae3d754 100644
      bool m_lidIsPresent;
      bool m_lidIsClosed;
 diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-index 97a409b..dd2cff8 100644
+index 97a409b..90ed22a 100644
 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
 +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
 @@ -2,7 +2,7 @@
@@ -278,23 +278,24 @@ index 97a409b..dd2cff8 100644
          if (m_upowerInterface->canSuspend() && m_upowerInterface->SuspendAllowed()) {
              kDebug() << "Can suspend";
              supported |= ToRam;
-@@ -125,7 +150,14 @@ void PowerDevilUPowerBackend::init()
+@@ -125,7 +150,15 @@ void PowerDevilUPowerBackend::init()
          }
      }
  
 -    connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
-+#if 0
-+    // CHECKME if login1 indeed has the resuming signal, it doesn't yet :/
 +    // "resuming" signal
-+    if (m_login1Interface) {
++    QDBusInterface systemdIface("/org/freedesktop/systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
++                                QDBusConnection::systemBus(), this);
++    int version = systemdIface.property("Version").toString().section(' ', 1).toInt();
++
++    if (m_login1Interface && version > 197) {
 +        connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool)));
 +    } else
-+#endif
 +        connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
  
      // battery
      QList<RecallNotice> recallList;
-@@ -246,7 +278,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
+@@ -246,7 +279,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
  
  KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method)
  {
@@ -307,7 +308,7 @@ index 97a409b..dd2cff8 100644
  }
  
  void PowerDevilUPowerBackend::enumerateDevices()
-@@ -337,4 +373,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
+@@ -337,4 +374,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
      m_onBattery = onBattery;
  }
  
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 362ed73..f45424f 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.98
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -979,6 +979,9 @@ fi
 
 
 %changelog
+* Wed Jan 30 Lukáš Tinkl <ltinkl at redhat.com> 4.9.98-7
+- update Powerdevil login1 patch
+
 * Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-6
 - unconditionally Obsoletes: kded_randrmonitor