From 43fd837e00860727a153eaf9e6ef7eb795319302 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 7 May 2010 20:38:46 +0100 Subject: [PATCH] Only emit ::Sleeping() after we've checked AboutToSleep() --- src/up-daemon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/up-daemon.c b/src/up-daemon.c index 33c400d..77ae399 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -313,10 +313,6 @@ up_daemon_about_to_sleep (UpDaemon *daemon, DBusGMethodInvocation *context) GError *error; UpDaemonPrivate *priv = daemon->priv; - egg_debug ("emitting sleeping"); - g_signal_emit (daemon, signals[SIGNAL_SLEEPING], 0); - g_timer_start (priv->about_to_sleep_timer); - /* already requested */ if (priv->about_to_sleep_id != 0) { error = g_error_new (UP_DAEMON_ERROR, @@ -334,6 +330,10 @@ up_daemon_about_to_sleep (UpDaemon *daemon, DBusGMethodInvocation *context) if (!up_polkit_check_auth (priv->polkit, subject, "org.freedesktop.upower.suspend", context)) goto out; + egg_debug ("emitting sleeping"); + g_signal_emit (daemon, signals[SIGNAL_SLEEPING], 0); + g_timer_start (priv->about_to_sleep_timer); + dbus_g_method_return (context, NULL); out: if (subject != NULL)