Merge lp:~robert-ancell/unity-greeter/shutdown-session-warning into lp:unity-greeter

[Robert Ancell]

Show a warning when shutting down and users are logged in

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1179
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/40/rebuild

review: Approve (continuous-integration)

=== modified file 'src/fixes.vapi'
--- src/fixes.vapi	2013-11-13 22:19:41 +0000
+++ src/fixes.vapi	2014-03-26 20:46:52 +0000
@@ -52,6 +52,7 @@
     public const int KEY_M;
     public const int KEY_s;
     public const int KEY_z;
+    public const int KEY_Z;
     public const int KEY_plus;
     public const int KEY_minus;
     public const int KEY_equal;
 
=== modified file 'src/main-window.vala'
--- src/main-window.vala	2014-02-27 04:53:21 +0000
+++ src/main-window.vala	2014-03-26 20:46:52 +0000
@@ -335,6 +335,13 @@
                 return true;
             }
             break;
+        case Gdk.KEY_Z:
+            if (UnityGreeter.singleton.test_mode && (event.state & Gdk.ModifierType.MOD1_MASK) != 0)
+            {
+                show_shutdown_dialog (ShutdownDialogType.RESTART);
+                return true;
+            }
+            break;
         }
 
         return base.key_press_event (event);
 
=== modified file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	2014-02-16 22:15:43 +0000
+++ src/shutdown-dialog.vala	2014-03-26 20:46:52 +0000
@@ -112,6 +112,30 @@
             text = _("Are you sure you want to shut down the computer?");
         }
 
+        var have_open_sessions = false;
+        try
+        {
+            var b = Bus.get_sync (BusType.SYSTEM);
+            var result = b.call_sync ("org.freedesktop.DisplayManager",
+                                      "/org/freedesktop/DisplayManager",
+                                      "org.freedesktop.DBus.Properties",
+                                      "Get",
+                                      new Variant ("(ss)", "org.freedesktop.DisplayManager", "Sessions"),
+                                      new VariantType ("(v)"),
+                                      DBusCallFlags.NONE,
+                                      -1,
+                                      null);
+            Variant value;
+            result.get ("(v)", out value);
+            have_open_sessions = value.n_children () > 0;
+        }
+        catch (Error e)
+        {
+            warning ("Failed to check sessions from logind: %s", e.message);
+        }
+        if (have_open_sessions)
+            text = "%s\n\n%s".printf (_("Other users are currently logged in to this computer, shutting down now will also close these other sessions."), text);
+
         var label = new Gtk.Label (text);
         label.set_line_wrap (true);
         label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));