Merge lp:~laney/indicator-datetime/use-upower into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Iain Lane]

Use logind instead of ConsoleKit to adjust the clock upon return from sleep.

We want to remove ConsoleKit dependencies from Ubuntu. indicator-datetime uses CK to be notified of system resume events in order to fix up the clock. You can do this with UPower, though. So no CK dep required.

It WFM - running under G_MESSAGES_DEBUG=all:

  (process:15395): Indicator-Datetime-DEBUG: System has been resumed; adjusting clock
  (process:15395): Indicator-Datetime-DEBUG: Updating Date/Time

Tested on both a pure CK and a CK/logind system. Not a pure logind one - I don't have one of those.

[Martin Pitt (pitti)]

Please note that AFAIK this is going away in upower 1.0, as this functionality moved into logind. So perhaps this should be adjusted right away?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/indicator-datetime/use-upower/+merge/153809/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/39/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/39/artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/39/artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/39/artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/39/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Hmm, OK. I see http://lists.freedesktop.org/archives/devkit-devel/2013-January/001339.html now.

Slight shame as this API is nicer than the logind one, but oh well.

[Iain Lane (laney)]

So here's another version which uses logind directly. It relies on the fix for bug #1157122. I'm also not sure what we should do with this branch now that the FFe has been declined.

[Martin Pitt (pitti)]

As this drops support for CK, I guess we need to keep this on the shelf until we switch to logind then?

Thanks!

[Ted Gould (ted)]

On Tue, 2013-03-19 at 12:01 +0000, Iain Lane wrote:

> So here's another version which uses logind directly. It relies on the
> fix for bug #1157122. I'm also not sure what we should do with this
> branch now that the FFe has been declined.

We've branched all the indicators for 13.10. It can land just fine in
the 13.10 branch.

[Iain Lane (laney)]

> On Tue, 2013-03-19 at 12:01 +0000, Iain Lane wrote:
>
> > So here's another version which uses logind directly. It relies on the
> > fix for bug #1157122. I'm also not sure what we should do with this
> > branch now that the FFe has been declined.
>
>
> We've branched all the indicators for 13.10. It can land just fine in
> the 13.10 branch.

Great - can this be reviewed for the 13.10 branch then please?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-raring-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/40/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me, esp. if we're switching to logind in a very short timeframe. This is in trunk and not for raring anyway.

review: Approve

[Martin Pitt (pitti)]

This looks fine for raring+1, thanks!

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2012-11-16 20:43:36 +0000
+++ debian/rules	2013-03-19 12:09:22 +0000
@@ -9,7 +9,7 @@
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static
+	dh_auto_configure -- --disable-static --disable-silent-rules
 
 override_dh_install:
 	find debian/indicator-datetime -name \*.la -delete

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2013-02-04 15:13:42 +0000
+++ src/datetime-service.c	2013-03-19 12:09:22 +0000
@@ -1154,11 +1154,12 @@
 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) {
+	// 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 ();
 		}
 	}
@@ -1174,7 +1175,7 @@
 	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 logind: %s", error->message);
 		g_clear_error (&error);
 		return;
 	}
@@ -1482,9 +1483,9 @@
 	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.login1",
+		                  "/org/freedesktop/login1",
+		                  "org.freedesktop.login1.Manager",
 		                  NULL, system_proxy_cb, dbus);
 
 	mainloop = g_main_loop_new(NULL, FALSE);