diff options
| author | Matthias Clasen <matthias.clasen@gmail.com> | 2010-08-19 12:45:13 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2010-08-19 12:45:13 +0200 |
| commit | 1fc5aae71f474f82ba62c7a92be3aef05cc7ebef (patch) | |
| tree | b10cff0f9c05ee4beed69149a7e6a0efbfcbeceb /src/up-daemon.c | |
| parent | 43ed5814cfd8dcfa9817777d6145a270a442f5c7 (diff) | |
| download | upower-1fc5aae71f474f82ba62c7a92be3aef05cc7ebef.tar.gz | |
Add missing D-Bus return in up_qos_cancel_request()
Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
Diffstat (limited to 'src/up-daemon.c')
| -rw-r--r-- | src/up-daemon.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/up-daemon.c b/src/up-daemon.c index 40bab80..6c5c320 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -480,7 +480,7 @@ up_daemon_suspend (UpDaemon *daemon, DBusGMethodInvocation *context) if (subject == NULL) 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)) goto out; /* already requested */ @@ -511,13 +511,21 @@ up_daemon_suspend_allowed (UpDaemon *daemon, DBusGMethodInvocation *context) gboolean ret; PolkitSubject *subject = NULL; UpDaemonPrivate *priv = daemon->priv; + GError *error; subject = up_polkit_get_subject (priv->polkit, context); if (subject == NULL) goto out; - ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context); - dbus_g_method_return (context, ret); + error = NULL; + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", &error); + if (error) { + dbus_g_method_return_error (context, error); + g_error_free (error); + } + else { + dbus_g_method_return (context, ret); + } out: if (subject != NULL) @@ -627,13 +635,21 @@ up_daemon_hibernate_allowed (UpDaemon *daemon, DBusGMethodInvocation *context) gboolean ret; PolkitSubject *subject = NULL; UpDaemonPrivate *priv = daemon->priv; + GError *error; subject = up_polkit_get_subject (priv->polkit, context); if (subject == NULL) goto out; - ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context); - dbus_g_method_return (context, ret); + error = NULL; + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", &error); + if (error) { + dbus_g_method_return_error (context, error); + g_error_free (error); + } + else { + dbus_g_method_return (context, ret); + } out: if (subject != NULL) |