[kdebase-workspace/f16] another try at the 'one true fix'(tm) for powermanagement dataengine (kde#288802)

[Rex Dieter]

commit 4fc4deb7be5bdfb9ec9d1af38bc2497d167c6d70
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 14 08:23:15 2011 -0600

    another try at the 'one true fix'(tm) for powermanagement dataengine (kde#288802)

 kde-workspace-4.7.5-kdebug288802-2.patch |   39 ++++++++++++++++++++++++++++++
 kdebase-workspace.spec                   |    8 +++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.7.5-kdebug288802-2.patch b/kde-workspace-4.7.5-kdebug288802-2.patch
new file mode 100644
index 0000000..d18311e
--- /dev/null
+++ b/kde-workspace-4.7.5-kdebug288802-2.patch
@@ -0,0 +1,39 @@
+diff --git a/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp b/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp
+index c513430..87b2db9 100644
+--- a/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp
++++ b/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp
+@@ -143,16 +143,6 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name)
+         setData("Battery", "Has Battery", !batterySources.isEmpty());
+         if (!batterySources.isEmpty()) {
+             setData("Battery", "Sources", batterySources);
+-            QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement",
+-                                                              "/org/kde/Solid/PowerManagement",
+-                                                              "org.kde.Solid.PowerManagement",
+-                                                              "batteryRemainingTime");
+-            QDBusPendingReply< qulonglong > reply = QDBusConnection::sessionBus().asyncCall(msg);
+-            reply.waitForFinished();
+-            if (reply.isValid()) {
+-                //kDebug() << "Remaining time 1:" << reply.value();
+-                setData("Battery", "Remaining msec", reply.value());
+-            }
+         }
+ 
+         m_sources = basicSourceNames() + batterySources;
+@@ -330,18 +320,6 @@ void PowermanagementEngine::reloadPowerDevilData()
+         }
+     }
+ 
+-    {
+-        QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement",
+-                                                          "/org/kde/Solid/PowerManagement",
+-                                                          "org.kde.Solid.PowerManagement",
+-                                                          "batteryRemainingTime");
+-        QDBusPendingReply< qulonglong > reply = QDBusConnection::sessionBus().asyncCall(msg);
+-        reply.waitForFinished();
+-        if (reply.isValid()) {
+-            batteryRemainingTimeChanged(reply.value());
+-        }
+-    }
+-
+     availableProfilesChanged();
+ }
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 3d27b94..c0aa291 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -82,6 +82,8 @@ Patch52: kdebase-workspace-4.7.0-bz#732830-login.patch
 Patch100: kdebase-workspace-4.7.5-batteryplasmoid.patch
 # http://bugs.kde.org/288802
 Patch101: kde-workspace-4.7.5-kdebug288802.patch
+# followup ^^
+Patch102: kde-workspace-4.7.5-kdebug288802-2.patch
 
 ## plasma active patches
 # adapted version of fix-wetab-power-button-freeze.patch
@@ -389,6 +391,7 @@ Requires: akonadi
 # upstream patches
 %patch100 -p1 -b .batteryplasmoid
 %patch101 -p1 -b .kdebug288802
+%patch102 -p1 -b .kdebug288802-2
 
 # plasma-active
 %patch150 -p1 -b .fix-wetab-power-button-freeze
@@ -868,6 +871,9 @@ fi
 
 
 %changelog
+* Wed Dec 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-4
+- another try at the 'one true fix'(tm) for powermanagement dataengine (kde#288802)
+
 * Tue Dec 13 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-3
 - more powermanagement dataengine love (kde#288802)