Merge lp:~cyphermox/indicator-session/logind-multiple-session-lp861171 into lp:indicator-session/13.10

[Mathieu Trudel-Lapierre]

Detect number of sessions via logind

Detect number of sessions via logind

[lp:~cyphermox/indicator-session/logind-multiple-session-lp861171]

395. By Mathieu Trudel-Lapierre on 2013-06-28

Do the right thing and ask the user for permission if trying to shutdown
or reboot while other sessions are still logged in. (LP: #861171)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/1

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

This looks great but let's get the GMenuified version of i-session landed first...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-saucy-armhf-ci/2

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

I'm going to update this patch to trunk i-session

Unmerged revisions

395. By Mathieu Trudel-Lapierre on 2013-06-28

Do the right thing and ask the user for permission if trying to shutdown
or reboot while other sessions are still logged in. (LP: #861171)

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-19 02:01:26 +0000
+++ debian/changelog	2013-06-28 18:36:28 +0000
@@ -1,3 +1,10 @@
+indicator-session (12.10.5daily13.06.28-0ubuntu1) UNRELEASED; urgency=low
+
+  * Do the right thing and ask the user for permission if trying to shutdown
+    or reboot while other sessions are still logged in. (LP: #861171)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 28 Jun 2013 11:37:10 -0400
+
 indicator-session (12.10.5daily13.06.19-0ubuntu1) saucy; urgency=low
 
   [ Mathieu Trudel-Lapierre ]

=== modified file 'src/dialog.c'
--- src/dialog.c	2013-04-11 15:33:54 +0000
+++ src/dialog.c	2013-06-28 18:36:28 +0000
@@ -64,6 +64,17 @@
 static const gchar * restart_auth = N_("Restart Instead…");
 static const gchar * body_logout_update = N_("Some software updates won’t apply until the computer next restarts.");
 
+/* TRANSLATORS: This button appears on the restart/shutdown dialog when
+   there are other users logged in. It will do a log out
+   in place of a restart / shutdown. */
+static const gchar * other_session = N_("Log Out Instead");
+static const gchar * restart_other_session = N_("Other users are logged in. Restarting the computer will log them out without warning.");
+static const gchar * restart_greeter_other_session = N_("Other users are logged in. You must log out these sessions before restarting.");
+static const gchar * shutdown_other_session = N_("Other users are logged in. Shutting down the computer will log them out without warning.");
+static const gchar * shutdown_greeter_other_session = N_("Other users are logged in. You must log out these sessions before shutting down.");
+static const gchar * restart_anyway = N_("Restart Anyway");
+static const gchar * shutdown_anyway = N_("Shut Down Anyway");
+
 static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	"system-log-out",
 	/* LOGOUT_DIALOG_RESTART, */	"system-restart",
@@ -164,10 +175,57 @@
 	return g_strcmp0 (allowed, "yes") == 0;
 }
 
+/* Checks with console kit how many sessions are open */
+static gulong
+get_n_sessions (void)
+{
+	Login1Manager *manager_proxy;
+	GVariant *sessions = NULL;
+	GVariantIter *iter;
+	gulong n_sessions = 0;
+	GError *error = NULL;
+
+	manager_proxy = login1_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+	                                                       G_DBUS_PROXY_FLAGS_NONE,
+	                                                       "org.freedesktop.login1",
+	                                                       "/org/freedesktop/login1",
+	                                                       NULL,
+	                                                       &error);
+	if (error) {
+		g_warning ("Could not get manager proxy.");
+		g_clear_error (&error);
+		goto out;
+	}
+
+	login1_manager_call_list_sessions_sync (manager_proxy, &sessions, NULL, &error);
+
+	if (error) {
+		g_warning ("Could not get session list.");
+		g_clear_error (&error);
+		goto out;
+	}
+
+	g_variant_get (sessions, "a(susso)", &iter);
+	n_sessions = g_variant_iter_n_children (iter);
+
+out:
+	g_debug ("found %d sessions", n_sessions);
+
+	return n_sessions;
+}
+
+static inline gboolean
+is_greeter_mode (void)
+{
+	return !g_strcmp0 (g_getenv ("INDICATOR_GREETER_MODE"), "1");
+}
+
 LogoutDialog *
 logout_dialog_new (LogoutDialogType type)
 {
-	GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG);
+	gulong n_sessions = get_n_sessions ();
+
+	GtkWidget * image = gtk_image_new_from_icon_name(n_sessions > 1 ? GTK_STOCK_DIALOG_WARNING : icon_strings[type], GTK_ICON_SIZE_DIALOG);
 	gtk_widget_show(image);
 
 	LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE,
@@ -205,7 +263,31 @@
 		button_text = g_dpgettext2 (NULL, "button auth", button_auth_strings[type]);
 	}
 
-	if (restart_required) {
+	if ((type == LOGOUT_DIALOG_TYPE_RESTART || type == LOGOUT_DIALOG_TYPE_SHUTDOWN) && n_sessions > 1) {
+		if (!is_greeter_mode ()) {
+			if (type == LOGOUT_DIALOG_TYPE_RESTART) {
+				g_object_set(dialog, "text", _(restart_other_session), NULL);
+        	    button_text = _(restart_anyway);
+			} else {
+				g_object_set(dialog, "text", _(shutdown_other_session), NULL);
+	            button_text = _(shutdown_anyway);
+			}
+			gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+			                       _(other_session), GTK_RESPONSE_HELP,
+			                       _("Cancel"), GTK_RESPONSE_CANCEL,
+                                   button_text, GTK_RESPONSE_YES,
+			                       NULL);
+		} else {
+			if (type == LOGOUT_DIALOG_TYPE_RESTART) {
+				g_object_set(dialog, "text", _(restart_greeter_other_session), NULL);
+			} else {
+				g_object_set(dialog, "text", _(shutdown_greeter_other_session), NULL);
+			}
+			gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+			                       GTK_STOCK_OK, GTK_RESPONSE_CANCEL,
+			                       NULL);
+		}
+	} else if (restart_required) {
 		const gchar * restart_req;
 		if (allowed) {
 			restart_req = restart_updates;

=== modified file 'src/gtk-logout-helper.c'
--- src/gtk-logout-helper.c	2013-04-19 10:08:46 +0000
+++ src/gtk-logout-helper.c	2013-06-28 18:36:28 +0000
@@ -122,7 +122,7 @@
 }
 
 static void
-session_action (LogoutDialogType action)
+session_action (LogoutDialogType action, gboolean force)
 {
 	GError * error = NULL;
 	GVariant *result = NULL;
@@ -131,11 +131,19 @@
 		g_debug("Asking Session manager to 'Logout'");
 		result = call_gnome_session ("Logout", g_variant_new ("(u)", 1), &error);
 	} else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) {
-		g_debug("Asking Session manager to 'RequestShutdown'");
-		result = call_gnome_session ("RequestShutdown", g_variant_new ("()"), &error);
+		if (force) {
+			logind_fallback(action);
+		} else {
+			g_debug("Asking Session manager to 'RequestShutdown'");
+			result = call_gnome_session ("RequestShutdown", g_variant_new ("()"), &error);
+		}
 	} else if (action == LOGOUT_DIALOG_TYPE_RESTART) {
-		g_debug("Asking Session manager to 'RequestReboot'");
-		result = call_gnome_session ("RequestReboot", g_variant_new ("()"), &error);
+		if (force) {
+			logind_fallback(action);
+		} else {
+			g_debug("Asking Session manager to 'RequestReboot'");
+			result = call_gnome_session ("RequestReboot", g_variant_new ("()"), &error);
+		}
 	} else {
 		g_warning ("Unknown session action");
 	}
@@ -234,12 +242,15 @@
 		dialog = GTK_WIDGET(logout_dialog_new(type));
 	}
 
+	gboolean force = FALSE;
 	if (dialog != NULL) {
 		GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_hide(dialog);
 
 		if (response == GTK_RESPONSE_OK) {
 			g_debug("Dialog return response: 'okay'");
+		} else if (response == GTK_RESPONSE_YES) {
+			g_debug("Dialog return response: 'yes'");
 		} else if (response == GTK_RESPONSE_HELP) {
 			g_debug("Dialog return response: 'help'");
 		} else {
@@ -247,17 +258,27 @@
 		}
 
 		if (response == GTK_RESPONSE_HELP) {
-			type = LOGOUT_DIALOG_TYPE_RESTART;
+			if (type == LOGOUT_DIALOG_TYPE_LOG_OUT)
+				type = LOGOUT_DIALOG_TYPE_RESTART;
+			else
+				type = LOGOUT_DIALOG_TYPE_LOG_OUT;
 			response = GTK_RESPONSE_OK;
 		}
 
+		/* If we know we're going to need authorization, then call for the action directly
+		 * rather than using Gnome session - it will just log us out instead and not prompt */
+		if (response == GTK_RESPONSE_YES) {
+			response = GTK_RESPONSE_OK;
+			force = TRUE;
+		}
+      
 		if (response != GTK_RESPONSE_OK) {
 			g_debug("Final response was not okay, quiting");
 			return 0;
 		}
 	}
 
-	session_action(type);
+	session_action(type, force);
 	g_debug("Finished action, quiting");
 
 	return 0;