Merge lp:~ballogy/indicator-session/systemd-support into lp:indicator-session/13.04

[Balló György]

This change adds systemd support for gtk-logout-helper.

Since shutdown/reboot with gnome-session works only with a patch that rejected by upstream[1], and consolekit is no longer available on systemd systems (e.g. Arch Linux), systemd-logind[2] is the only way to do this.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=575880
[2] http://www.freedesktop.org/wiki/Software/systemd/logind

[Mathieu Trudel-Lapierre (cyphermox)]

Removing the consolekit_fallback looks wrong at first glance; but there's not enough context to see what's up. Seems to me like doing things this way would break those systems that should still fallback using consolekit.

It *is* a call to consolekit_fallback from within call_consolkit though, so maybe doing things this way isn't so crazy, but it seems to me like the initial assumption was to try again if the call to consolekit somehow failed; so that the failure can be recovered from.

Shouldn't it be possible to decide which backend to use at compile time?

review: Needs Information

[Balló György (ballogy)]

Calling consolekit_fallback from within consolekit_fallback would lead to an infinite loop if consolekit is not available, so I don't think it's a good solution. It was introduced by a debugging commit:
http://bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.13.04/revision/209

With my patch, gtk-logout-helper tries to use gnome-session first, then falls back to consolekit, and in the last case, it falls back to systemd. Of course, it can be easily implemented as a build option also, but I think it's simpler implementation as a fallback of fallback.

[Mathieu Trudel-Lapierre (cyphermox)]

This is still missing a review from Jenkins for CI, and I'd honestly like to see a review from someone else who knows more about consolekit and all than I do.

As for another branch from you, let's commit this to trunk as well. Could you please file another merge request for the same changes against lp:indicator-session?

review: Abstain

[Ted Gould (ted)]

I don't think this can reasonably land in 13.04 so I'm going to mark it as rejected. Not to the idea overall, but just to this MR.

Unmerged revisions

381. By Balló György on 2013-01-02

Add support for systemd

=== modified file 'src/gtk-logout-helper.c'
--- src/gtk-logout-helper.c	2012-11-29 22:09:57 +0000
+++ src/gtk-logout-helper.c	2013-01-02 19:00:42 +0000
@@ -31,6 +31,71 @@
 #include "shared-names.h"
 
 static GVariant *
+call_systemd (const gchar *method, GVariant *parameters, GError **error)
+{
+	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, error);
+	if (!bus)
+	{
+		g_variant_unref (parameters);
+		return NULL;
+	}
+
+	GVariant *result = g_dbus_connection_call_sync(bus,
+	                                               "org.freedesktop.login1",
+	                                               "/org/freedesktop/login1",
+	                                               "org.freedesktop.login1.Manager",
+	                                               method,
+	                                               parameters,
+	                                               NULL,
+	                                               G_DBUS_CALL_FLAGS_NONE,
+	                                               -1,
+	                                               NULL,
+	                                               error);
+	g_object_unref (bus);
+
+	return result;
+}
+
+static void
+systemd_fallback (LogoutDialogType action)
+{
+	GError * error = NULL;
+	GVariant *result = NULL;
+
+	g_debug("Falling back to using systemd for action");
+
+	switch (action) {
+		case LOGOUT_DIALOG_TYPE_LOG_OUT:
+			g_warning("Unable to fallback to systemd for logout as it's a session issue.  We need some sort of session handler.");
+			break;
+		case LOGOUT_DIALOG_TYPE_SHUTDOWN:
+			g_debug("Telling systemd to 'PowerOff'");
+			result = call_systemd ("PowerOff", g_variant_new ("(b)", TRUE), &error);
+			break;
+		case LOGOUT_DIALOG_TYPE_RESTART:
+			g_debug("Telling systemd to 'Reboot'");
+			result = call_systemd ("Reboot", g_variant_new ("(b)", TRUE), &error);
+			break;
+		default:
+			g_warning("Unknown action");
+			break;
+	}
+
+	if (!result) {
+		if (error != NULL) {
+			g_warning ("systemd action failed: %s", error->message);
+		} else {
+			g_warning ("systemd action failed: unknown error");
+		}
+	}
+	else
+		g_variant_unref (result);
+	g_clear_error (&error);
+
+	return;
+}
+
+static GVariant *
 call_console_kit (const gchar *method, GVariant *parameters, GError **error)
 {
 	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, error);
@@ -88,7 +153,7 @@
 			g_warning ("ConsoleKit action failed: unknown error");
 		}
 
-		consolekit_fallback(action);
+		systemd_fallback(action);
 	}
 	else
 		g_variant_unref (result);