From a82bb8ab4d50eec7a1cdc3b9b8438834fb22442e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 18 Mar 2013 13:45:27 +0000 Subject: Use NotifyResume from UPower to trigger the clock adjustment on resume Removes a ConsoleKit dependency. --- src/datetime-service.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/datetime-service.c b/src/datetime-service.c index 56ea51c..b0182c9 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1154,13 +1154,10 @@ static void session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data) { - // Just returned from suspend - if (g_strcmp0(signal_name, "SystemIdleHintChanged") == 0) { - gboolean idle = FALSE; - g_variant_get(parameters, "(b)", &idle); - if (!idle) { - on_clock_skew (); - } + // Just returned from suspend. Don't care about the sleep type. + if (g_strcmp0(signal_name, "NotifyResume") == 0) { + g_debug ("System has been resumed; adjusting clock"); + on_clock_skew (); } return; } @@ -1174,7 +1171,7 @@ system_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); if (error != NULL) { - g_warning("Could not grab DBus proxy for ConsoleKit: %s", error->message); + g_warning("Could not grab DBus proxy for UPower: %s", error->message); g_clear_error (&error); return; } @@ -1482,9 +1479,9 @@ main (int argc, char ** argv) g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.freedesktop.ConsoleKit", - "/org/freedesktop/ConsoleKit/Manager", - "org.freedesktop.ConsoleKit.Manager", + "org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.UPower", NULL, system_proxy_cb, dbus); mainloop = g_main_loop_new(NULL, FALSE); -- cgit v1.2.3 From bfed177813a2ca323e092511cc8fb2ffd413b127 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 19 Mar 2013 09:53:10 +0000 Subject: Use logind instead of UPower as the UPower interface we're relying on will go away --- src/datetime-service.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/datetime-service.c b/src/datetime-service.c index b0182c9..549a45c 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1154,10 +1154,14 @@ static void session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data) { - // Just returned from suspend. Don't care about the sleep type. - if (g_strcmp0(signal_name, "NotifyResume") == 0) { - g_debug ("System has been resumed; adjusting clock"); - on_clock_skew (); + // Suspending / returning from suspend (true / false) + if (g_strcmp0(signal_name, "PrepareForSleep") == 0) { + gboolean sleeping = FALSE; + g_variant_get (parameters, "(b)", &sleeping); + if (!sleeping) { + g_debug ("System has been resumed; adjusting clock"); + on_clock_skew (); + } } return; } @@ -1171,7 +1175,7 @@ system_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); if (error != NULL) { - g_warning("Could not grab DBus proxy for UPower: %s", error->message); + g_warning("Could not grab DBus proxy for logind: %s", error->message); g_clear_error (&error); return; } @@ -1479,9 +1483,9 @@ main (int argc, char ** argv) g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, - "org.freedesktop.UPower", - "/org/freedesktop/UPower", - "org.freedesktop.UPower", + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", NULL, system_proxy_cb, dbus); mainloop = g_main_loop_new(NULL, FALSE); -- cgit v1.2.3 From 271cbd1d1ec1916bb80308908d940d43d7c6d7ee Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 19 Mar 2013 12:01:43 +0000 Subject: Whitespace fixes --- src/datetime-service.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/datetime-service.c b/src/datetime-service.c index 549a45c..fd77948 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1156,12 +1156,12 @@ session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signa { // Suspending / returning from suspend (true / false) if (g_strcmp0(signal_name, "PrepareForSleep") == 0) { - gboolean sleeping = FALSE; - g_variant_get (parameters, "(b)", &sleeping); - if (!sleeping) { - g_debug ("System has been resumed; adjusting clock"); - on_clock_skew (); - } + gboolean sleeping = FALSE; + g_variant_get (parameters, "(b)", &sleeping); + if (!sleeping) { + g_debug ("System has been resumed; adjusting clock"); + on_clock_skew (); + } } return; } -- cgit v1.2.3