[upower/f14/master] Dbus error handling fixes

[Matthias Clasen]

commit a5e7acc9d8d4bbb00815177849f2d2dc45b4c364
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 17 22:07:14 2010 -0400

    Dbus error handling fixes

 upower-dbus-fixes.patch |    2 +-
 upower.spec             |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/upower-dbus-fixes.patch b/upower-dbus-fixes.patch
index 2bad9b1..01759a6 100644
--- a/upower-dbus-fixes.patch
+++ b/upower-dbus-fixes.patch
@@ -31,7 +31,7 @@ index 3fb952b..4884b64 100644
  		goto out;
  
 -	if (!up_polkit_check_auth (priv->polkit, subject, "org.freedesktop.upower.suspend", context))
-+	if (!up_polkit_check_auth (priv->polkit, subject, "org.freedesktop.upower.suspend", NULL))
++	if (!up_polkit_check_auth (priv->polkit, subject, "org.freedesktop.upower.suspend", context))
  		goto out;
  
  	/* already requested */
diff --git a/upower.spec b/upower.spec
index fdb04da..b08a7be 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,7 +1,7 @@
 Summary:        Power Management Service
 Name:           upower
 Version:        0.9.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://hal.freedesktop.org/releases/
@@ -34,6 +34,8 @@ Provides: DeviceKit-power
 # Prevent a crash when gnome-power-manager starts up
 Patch0: upower-clear-error.patch
 
+Patch1: upower-dbus-fixes.patch
+
 %description
 UPower (formerly DeviceKit-power) provides a daemon, API and command
 line tools for managing power devices attached to the system.
@@ -53,6 +55,7 @@ Headers and libraries for UPower.
 %prep
 %setup -q
 %patch0 -p1 -b .clear-error
+%patch1 -p1 -b .dbus-fixes
 
 %build
 %configure \
@@ -112,6 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/libupower-glib/upower.h
 
 %changelog
+* Tue Aug 17 2010 Matthias Clasen <mclasen at redhat.com> 0.9.5-6
+- DBus error handling fixes
+
 * Thu Aug 12 2010 Matthias Clasen <mclasen at redhat.com> 0.9.5-5
 - Prevent crash due to uninitialized GError