From e672ccb6917772f2e7f0f4294eb2828193eaa89f Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 5 Oct 2009 14:31:22 -0400 Subject: [PATCH] Actually inhibit the daemon when Inhibit() is called Guess this was forgotten with the polkit-1 porting effort. --- src/devkit-disks-daemon.c | 10 ++++++++-- src/devkit-disks-daemon.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/devkit-disks-daemon.c b/src/devkit-disks-daemon.c index b8c933b..e3f5bc6 100644 --- a/src/devkit-disks-daemon.c +++ b/src/devkit-disks-daemon.c @@ -1288,7 +1288,13 @@ devkit_disks_daemon_local_check_auth (DevkitDisksDaemon *daemon, } va_end (va_args); - if (action_id != NULL) { + if (devkit_disks_daemon_local_is_inhibited (daemon)) { + throw_error (data->context, + DEVKIT_DISKS_ERROR_INHIBITED, + "Daemon is inhibited"); + check_auth_data_free (data); + + } else if (action_id != NULL) { PolkitSubject *subject; PolkitDetails *details; PolkitCheckAuthorizationFlags flags; @@ -1783,7 +1789,7 @@ daemon_inhibitor_disconnected_cb (DevkitDisksInhibitor *inhibitor, } gboolean -devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon *daemon) +devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon *daemon) { return daemon->priv->inhibitors != NULL; } diff --git a/src/devkit-disks-daemon.h b/src/devkit-disks-daemon.h index dd0a4f0..3164734 100644 --- a/src/devkit-disks-daemon.h +++ b/src/devkit-disks-daemon.h @@ -123,7 +123,7 @@ void devkit_disks_daemon_local_update_spindown (DevkitDisksDae gboolean devkit_disks_daemon_local_has_polling_inhibitors (DevkitDisksDaemon *daemon); -gboolean devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon *daemon); +gboolean devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon *daemon); DevkitDisksMountMonitor *devkit_disks_daemon_local_get_mount_monitor (DevkitDisksDaemon *daemon); -- 2.7.4