[kde-workspace] refresh Powerdevil login1 patch

[Rex Dieter]

commit f27aefa30391b70747dbb7b36362178933369858
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 4 10:03:31 2013 -0600

    refresh Powerdevil login1 patch

 ...orkspace-4.9.98-powerdevil_systemd_login1.patch |   13 +++++++------
 kde-workspace.spec                                 |    5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/kde-workspace-4.9.98-powerdevil_systemd_login1.patch b/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
index da645bf..d52bea1 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..90ed22a 100644
+index 97a409b..f9503b3 100644
 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
 +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
 @@ -2,7 +2,7 @@
@@ -278,24 +278,25 @@ index 97a409b..90ed22a 100644
          if (m_upowerInterface->canSuspend() && m_upowerInterface->SuspendAllowed()) {
              kDebug() << "Can suspend";
              supported |= ToRam;
-@@ -125,7 +150,15 @@ void PowerDevilUPowerBackend::init()
+@@ -125,7 +150,16 @@ void PowerDevilUPowerBackend::init()
          }
      }
  
 -    connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
 +    // "resuming" signal
-+    QDBusInterface systemdIface("/org/freedesktop/systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
++    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
++    } else {
 +        connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
++    }
  
      // battery
      QList<RecallNotice> recallList;
-@@ -246,7 +279,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
+@@ -246,7 +280,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
  
  KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method)
  {
@@ -308,7 +309,7 @@ index 97a409b..90ed22a 100644
  }
  
  void PowerDevilUPowerBackend::enumerateDevices()
-@@ -337,4 +374,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
+@@ -337,4 +375,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
      m_onBattery = onBattery;
  }
  
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 198e63a..035b90e 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -983,6 +983,9 @@ fi
 
 
 %changelog
+* Mon Feb 04 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.0-3
+- refresh Powerdevil login1 patch
+
 * Sat Feb 02 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.10.0-2
 - fix kcmdatetimehelper search path so hwclock and zic are found (#906854)