Merge lp:~robert-ancell/unity-greeter/end-session-dialog into lp:unity-greeter

[Robert Ancell]

Use Unity style shutdown dialogs
Handle hardware power button in greeter

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1016
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-armhf-ci/8

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/13/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/unity-greeter/end-session-dialog]

1017. By Robert Ancell on 2013-10-21

Fix copyright header

1018. By Robert Ancell on 2013-10-21

Mark strings as translatable

1019. By Robert Ancell on 2013-10-21

Add bug link about DBusConnection.call_with_unix_fd_list being broken

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-armhf-ci/10/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-greeter/end-session-dialog]

1020. By Robert Ancell on 2013-10-21

Fix typo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-armhf-ci/11/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-greeter/end-session-dialog]

1021. By Robert Ancell on 2013-10-21

Add shutdown-dialog.c to POTFILES.skip

1022. By Robert Ancell on 2013-10-21

Use real ellipses

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1022
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-saucy-armhf-ci/12

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/17/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

So we talked about this on IRC. Sounds like it needs at least keyboard navigation before landing. Also mentioned was the use of a well-known DBus name vs unique.

[Michael Terry (mterry)]

Whoops, forgot to set status.

review: Needs Fixing

[lp:~robert-ancell/unity-greeter/end-session-dialog]

1023. By Robert Ancell on 2013-11-05

Merge with trunk

1024. By Robert Ancell on 2013-11-05

Fix indent to be clearer

1025. By Robert Ancell on 2013-11-05

Use clicked signal instead of pressed signal which is deprecated

1026. By Robert Ancell on 2013-11-05

Bus.own_name doesn't throw an error

1027. By Robert Ancell on 2013-11-05

Mark D-Bus interface as public so it doesn't warn about unused fields

1028. By Robert Ancell on 2013-11-05

Close dialog when selecting a button

1029. By Robert Ancell on 2013-11-05

Disable input to login box when shutdown dialog open

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/20/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/unity-greeter/end-session-dialog]

1030. By Robert Ancell on 2013-11-05

note that the shutdown dialog click out is broken

1031. By Robert Ancell on 2013-11-05

Support keyboard shortcuts

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/21/rebuild

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2013-10-02 17:46:49 +0000
+++ configure.ac	2013-11-05 04:15:26 +0000
@@ -2,7 +2,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(unity-greeter, 13.10.3)
+AC_INIT(unity-greeter, 14.04.0)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-10-18 14:45:57 +0000
+++ data/Makefile.am	2013-11-05 04:15:26 +0000
@@ -9,13 +9,26 @@
 	arrow_left.png \
 	arrow_right.png \
 	cof.png \
+	dialog_close_highlight.png \
+	dialog_close.png \
 	gnome_badge.png \
+	hibernate_highlight.png \
+	hibernate.png \
 	kde_badge.png \
 	logo.png \
 	message.png \
 	recovery_console_badge.png \
 	remote_login_help.png \
+	restart_highlight.png \
+	restart.png \
 	shadow.png \
+	shutdown_highlight.png \
+	shutdown.png \
+	suspend_highlight.png \
+	suspend.png \
+	switcher_corner.png \
+	switcher_left.png \
+	switcher_top.png \
 	ubuntu_badge.png \
 	unknown_badge.png
 

=== added file 'data/dialog_close.png'
Binary files data/dialog_close.png	1970-01-01 00:00:00 +0000 and data/dialog_close.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/dialog_close_highlight.png'
Binary files data/dialog_close_highlight.png	1970-01-01 00:00:00 +0000 and data/dialog_close_highlight.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/hibernate.png'
Binary files data/hibernate.png	1970-01-01 00:00:00 +0000 and data/hibernate.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/hibernate_highlight.png'
Binary files data/hibernate_highlight.png	1970-01-01 00:00:00 +0000 and data/hibernate_highlight.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/restart.png'
Binary files data/restart.png	1970-01-01 00:00:00 +0000 and data/restart.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/restart_highlight.png'
Binary files data/restart_highlight.png	1970-01-01 00:00:00 +0000 and data/restart_highlight.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/shutdown.png'
Binary files data/shutdown.png	1970-01-01 00:00:00 +0000 and data/shutdown.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/shutdown_highlight.png'
Binary files data/shutdown_highlight.png	1970-01-01 00:00:00 +0000 and data/shutdown_highlight.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/suspend.png'
Binary files data/suspend.png	1970-01-01 00:00:00 +0000 and data/suspend.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/suspend_highlight.png'
Binary files data/suspend_highlight.png	1970-01-01 00:00:00 +0000 and data/suspend_highlight.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/switcher_corner.png'
Binary files data/switcher_corner.png	1970-01-01 00:00:00 +0000 and data/switcher_corner.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/switcher_left.png'
Binary files data/switcher_left.png	1970-01-01 00:00:00 +0000 and data/switcher_left.png	2013-11-05 04:15:26 +0000 differ
=== added file 'data/switcher_top.png'
Binary files data/switcher_top.png	1970-01-01 00:00:00 +0000 and data/switcher_top.png	2013-11-05 04:15:26 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 13:59:34 +0000
+++ debian/changelog	2013-11-05 04:15:26 +0000
@@ -1,3 +1,10 @@
+unity-greeter (14.04.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * Use Unity style shutdown dialogs
+  * Handle hardware power button in greeter
+
+ -- Robert Ancell <[e-mail]>  Mon, 21 Oct 2013 17:15:38 +1300
+
 unity-greeter (13.10.3-0ubuntu1) saucy; urgency=low
 
   [ William Hua ]

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-11-08 15:48:14 +0000
+++ po/POTFILES.in	2013-11-05 04:15:26 +0000
@@ -19,8 +19,8 @@
 src/session-list.vala
 src/settings-daemon.vala
 src/settings.vala
+src/shutdown-dialog.vala
 src/toggle-box.vala
 src/unity-greeter.vala
 src/user-list.vala
 src/user-prompt-box.vala
-

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-11-08 15:48:14 +0000
+++ po/POTFILES.skip	2013-11-05 04:15:26 +0000
@@ -17,6 +17,7 @@
 src/session-list.c
 src/settings-daemon.c
 src/settings.c
+src/shutdown-dialog.c
 src/toggle-box.c
 src/unity-greeter.c
 src/user-list.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-10-17 22:09:16 +0000
+++ src/Makefile.am	2013-11-05 04:15:26 +0000
@@ -27,6 +27,7 @@
 	remote-login-service.vala \
 	settings.vala \
 	settings-daemon.vala \
+	shutdown-dialog.vala \
 	toggle-box.vala \
 	unity-greeter.vala \
 	user-list.vala \

=== modified file 'src/fixes.vapi'
--- src/fixes.vapi	2013-10-24 12:27:03 +0000
+++ src/fixes.vapi	2013-11-05 04:15:26 +0000
@@ -33,12 +33,16 @@
     public const int KEY_Page_Down;
     public const int KEY_Up;
     public const int KEY_Down;
+    public const int KEY_Left;
+    public const int KEY_Right;
     public const int KEY_KP_Home;
     public const int KEY_KP_End;
     public const int KEY_KP_Page_Up;
     public const int KEY_KP_Page_Down;
     public const int KEY_KP_Up;
     public const int KEY_KP_Down;
+    public const int KEY_KP_Left;
+    public const int KEY_KP_Right;
     public const int KEY_F10;
     public const int KEY_0;
     public const int KEY_g;
@@ -47,10 +51,12 @@
     public const int KEY_m;
     public const int KEY_M;
     public const int KEY_s;
+    public const int KEY_z;
     public const int KEY_plus;
     public const int KEY_minus;
     public const int KEY_equal;
     public const int CONTROL_MASK;
+    public const int KEY_PowerOff;
 }
 
 namespace Gtk

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2013-02-08 15:53:16 +0000
+++ src/main-window.vala	2013-11-05 04:15:26 +0000
@@ -24,10 +24,12 @@
     public MenuBar menubar;
 
     private List<Monitor> monitors;
+    private Monitor active_monitor;
     private Background background;
     private Gtk.Box login_box;
     private Gtk.Box hbox;
     private Gtk.Button back_button;
+    private ShutdownDialog? shutdown_dialog = null;
 
     public ListStack stack;
 
@@ -245,9 +247,16 @@
 
     private void move_to_monitor (Monitor monitor)
     {
+        active_monitor = monitor;
         login_box.set_size_request (monitor.width, monitor.height);
         background.set_active_monitor (monitor);
         background.move (login_box, monitor.x, monitor.y);
+
+        if (shutdown_dialog != null)
+        {
+            shutdown_dialog.set_size_request (monitor.width, monitor.height);
+            background.move (shutdown_dialog, monitor.x, monitor.y);
+        }
     }
 
     private void add_user_list ()
@@ -266,36 +275,88 @@
         switch (event.keyval)
         {
         case Gdk.KEY_Escape:
-            top.cancel_authentication ();
-            break;
+            if (login_box.sensitive)
+                top.cancel_authentication ();
+            if (shutdown_dialog != null)
+                shutdown_dialog.cancel ();
+            return true;
         case Gdk.KEY_Page_Up:
         case Gdk.KEY_KP_Page_Up:
-            top.scroll (GreeterList.ScrollTarget.START);
-            break;
+            if (login_box.sensitive)
+                top.scroll (GreeterList.ScrollTarget.START);
+            return true;
         case Gdk.KEY_Page_Down:
         case Gdk.KEY_KP_Page_Down:
-            top.scroll (GreeterList.ScrollTarget.END);
-            break;
+            if (login_box.sensitive)
+                top.scroll (GreeterList.ScrollTarget.END);
+            return true;
         case Gdk.KEY_Up:
         case Gdk.KEY_KP_Up:
-            top.scroll (GreeterList.ScrollTarget.UP);
-            break;
+            if (login_box.sensitive)
+                top.scroll (GreeterList.ScrollTarget.UP);
+            return true;
         case Gdk.KEY_Down:
         case Gdk.KEY_KP_Down:
-            top.scroll (GreeterList.ScrollTarget.DOWN);
-            break;
+            if (login_box.sensitive)
+                top.scroll (GreeterList.ScrollTarget.DOWN);
+            return true;
+        case Gdk.KEY_Left:
+        case Gdk.KEY_KP_Left:
+            if (shutdown_dialog != null)
+                shutdown_dialog.focus_prev ();
+            return true;
+        case Gdk.KEY_Right:
+        case Gdk.KEY_KP_Right:
+            if (shutdown_dialog != null)
+                shutdown_dialog.focus_next ();
+            return true;
         case Gdk.KEY_F10:
-            menubar.select_first (false);
+            if (login_box.sensitive)
+                menubar.select_first (false);
+            return true;
+        case Gdk.KEY_PowerOff:
+            show_shutdown_dialog (ShutdownDialogType.SHUTDOWN);
+            return true;
+        case Gdk.KEY_z:
+            if (UnityGreeter.singleton.test_mode && (event.state & Gdk.ModifierType.MOD1_MASK) != 0)
+            {
+                show_shutdown_dialog (ShutdownDialogType.SHUTDOWN);
+                return true;
+            }
             break;
-        default:
-            return base.key_press_event (event);
         }
 
-        return true;
+        return base.key_press_event (event);
     }
 
     public void set_keyboard_state ()
     {
         menubar.set_keyboard_state ();
     }
+
+    public void show_shutdown_dialog (ShutdownDialogType type)
+    {
+        if (shutdown_dialog != null)
+            shutdown_dialog.destroy ();
+
+        /* Stop input to login box */
+        login_box.sensitive = false;
+
+        shutdown_dialog = new ShutdownDialog (type);
+        shutdown_dialog.visible = true;
+        shutdown_dialog.close.connect (close_shutdown_dialog);
+        background.add (shutdown_dialog);
+        move_to_monitor (active_monitor);
+    }
+
+    public void close_shutdown_dialog ()
+    {
+        if (shutdown_dialog == null)
+            return;
+
+        shutdown_dialog.destroy ();
+        shutdown_dialog = null;
+
+        login_box.sensitive = true;
+    }
 }

=== modified file 'src/settings-daemon.vala'
--- src/settings-daemon.vala	2013-01-30 20:31:38 +0000
+++ src/settings-daemon.vala	2013-11-05 04:15:26 +0000
@@ -19,6 +19,8 @@
 
 public class SettingsDaemon : Object
 {
+    private int logind_inhibit_fd = -1;
+
     public async void start ()
     {
         configure ();
@@ -64,6 +66,40 @@
            require gnome-session and it's Presence DBus interface to be run. */
         GLib.Bus.own_name (GLib.BusType.SESSION, "org.gnome.ScreenSaver",
                            GLib.BusNameOwnerFlags.NONE);
+
+        /* The media-keys plugin inhibits the power key, but we don't want
+           all the other keys doing things. So inhibit it ourselves */
+        /* NOTE: We are using the synchronous method here since there is a bug in Vala/GLib in that
+         * g_dbus_connection_call_with_unix_fd_list_finish and g_dbus_proxy_call_with_unix_fd_list_finish
+         * don't have the GAsyncResult as the second argument.
+         * https://bugzilla.gnome.org/show_bug.cgi?id=688907
+         */
+        try
+        {
+            var b = Bus.get_sync (BusType.SYSTEM);
+            UnixFDList fd_list;
+            var result = b.call_with_unix_fd_list_sync  ("org.freedesktop.login1",
+                                                         "/org/freedesktop/login1",
+                                                         "org.freedesktop.login1.Manager",
+                                                         "Inhibit",
+                                                         new Variant ("(ssss)",
+                                                                      "handle-power-key",
+                                                                      Environment.get_user_name (),
+                                                                      "Unity Greeter handling keypresses",
+                                                                      "block"),
+                                                         new VariantType ("(h)"),
+                                                         DBusCallFlags.NONE,
+                                                         -1,
+                                                         null,
+                                                         out fd_list);
+            int32 index = -1;
+            result.get ("(h)", &index);
+            logind_inhibit_fd = fd_list.get (index);
+        }
+        catch (Error e)
+        {
+            warning ("Failed to inhibit power keys: %s", e.message);
+        }
     }
 
     private void set_plugin_enabled (string schema_name, bool enabled)

=== added file 'src/shutdown-dialog.vala'
--- src/shutdown-dialog.vala	1970-01-01 00:00:00 +0000
+++ src/shutdown-dialog.vala	2013-11-05 04:15:26 +0000
@@ -0,0 +1,381 @@
+/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*-
+ *
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Robert Ancell <[e-mail]>
+ */
+
+public enum ShutdownDialogType
+{
+    LOGOUT,
+    SHUTDOWN,
+    RESTART
+}
+
+public class ShutdownDialog : Gtk.Fixed
+{
+    public signal void close ();
+
+    private Cairo.ImageSurface? corner_surface = null;
+    private Cairo.ImageSurface? left_surface = null;
+    private Cairo.ImageSurface? top_surface = null;
+    private Cairo.Pattern? corner_pattern = null;
+    private Cairo.Pattern? left_pattern = null;
+    private Cairo.Pattern? top_pattern = null;
+    
+    private const int BORDER_SIZE = 30;
+    private const int CLOSE_OFFSET = 3;
+
+    private Gtk.Box vbox;
+    private DialogButton close_button;
+    private Gtk.Box button_box;
+
+    public ShutdownDialog (ShutdownDialogType type)
+    {
+        vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        vbox.visible = true;
+        add (vbox);
+
+        vbox.border_width = 20;
+
+        var title_label = new Gtk.Label (_("Shutdown"));
+        title_label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 15"));
+        title_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
+        title_label.set_alignment (0.0f, 0.5f);
+        vbox.pack_start (title_label, false, false, 0);
+
+        string text;
+        if (type == ShutdownDialogType.SHUTDOWN)
+            text = _("Goodbye. Would you like to…");
+        else
+        {
+            text = _("Are you sure you want to shut down the computer?");
+            title_label.visible = true;
+        }
+        var label = new Gtk.Label (text);
+        label.set_line_wrap (true);
+        label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+        label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
+        label.set_alignment (0.0f, 0.5f);
+        label.visible = true;
+        vbox.pack_start (label, false, false, 0);
+
+        button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+        button_box.visible = true;
+        vbox.pack_start (button_box, false, false, 0);
+
+        if (type == ShutdownDialogType.SHUTDOWN)
+        {
+            if (LightDM.get_can_suspend ())
+            {
+                var button = add_button (_("Suspend"), Path.build_filename (Config.PKGDATADIR, "suspend.png"), Path.build_filename (Config.PKGDATADIR, "suspend_highlight.png"));
+                button.clicked.connect (() =>
+                {
+                    try
+                    {
+                        LightDM.suspend ();
+                        close ();
+                    }
+                    catch (Error e)
+                    {
+                        warning ("Failed to suspend: %s", e.message);
+                    }
+                });
+            }
+
+            if (LightDM.get_can_hibernate ())
+            {
+                var button = add_button (_("Hibernate"), Path.build_filename (Config.PKGDATADIR, "hibernate.png"), Path.build_filename (Config.PKGDATADIR, "hibernate_highlight.png"));
+                button.clicked.connect (() =>
+                {
+                    try
+                    {
+                        LightDM.hibernate ();
+                        close ();
+                    }
+                    catch (Error e)
+                    {
+                        warning ("Failed to hibernate: %s", e.message);
+                    }
+                });
+            }
+        }
+
+        if (LightDM.get_can_restart ())
+        {
+            var button = add_button (_("Restart"), Path.build_filename (Config.PKGDATADIR, "restart.png"), Path.build_filename (Config.PKGDATADIR, "restart_highlight.png"));
+            button.clicked.connect (() =>
+            {
+                try
+                {
+                    LightDM.restart ();
+                    close ();
+                }
+                catch (Error e)
+                {
+                    warning ("Failed to restart: %s", e.message);
+                }
+            });
+        }
+
+        if (LightDM.get_can_shutdown ())
+        {
+            var button = add_button (_("Shutdown"), Path.build_filename (Config.PKGDATADIR, "shutdown.png"), Path.build_filename (Config.PKGDATADIR, "shutdown_highlight.png"));
+            button.clicked.connect (() =>
+            {
+                try
+                {
+                    LightDM.shutdown ();
+                    close ();
+                }
+                catch (Error e)
+                {
+                    warning ("Failed to shutdown: %s", e.message);
+                }
+            });
+        }
+
+        close_button = new DialogButton (Path.build_filename (Config.PKGDATADIR, "dialog_close.png"), Path.build_filename (Config.PKGDATADIR, "dialog_close_highlight.png"));
+        close_button.can_focus = false;
+        close_button.clicked.connect (() => { close (); });
+        close_button.visible = true;
+        add (close_button);
+    }
+
+    public void focus_next ()
+    {
+        (get_toplevel () as Gtk.Window).move_focus (Gtk.DirectionType.TAB_FORWARD);
+    }
+
+    public void focus_prev ()
+    {
+        (get_toplevel () as Gtk.Window).move_focus (Gtk.DirectionType.TAB_BACKWARD);
+    }
+
+    public void cancel ()
+    {
+        var widget = (get_toplevel () as Gtk.Window).get_focus ();
+        if (widget is DialogButton)
+            (get_toplevel () as Gtk.Window).set_focus (null);
+        else
+            close ();
+    }
+
+    public override void size_allocate (Gtk.Allocation allocation)
+    {
+        base.size_allocate (allocation);
+
+        var content_allocation = Gtk.Allocation ();
+        int minimum_width, natural_width, minimum_height, natural_height;
+        vbox.get_preferred_width (out minimum_width, out natural_width);
+        vbox.get_preferred_height_for_width (minimum_width, out minimum_height, out natural_height);
+        content_allocation.x = allocation.x + (allocation.width - minimum_width) / 2;
+        content_allocation.y = allocation.y + (allocation.height - minimum_height) / 2;
+        content_allocation.width = minimum_width;
+        content_allocation.height = minimum_height;
+        vbox.size_allocate (content_allocation);
+
+        var a = Gtk.Allocation ();
+        close_button.get_preferred_width (out minimum_width, out natural_width);
+        close_button.get_preferred_height (out minimum_height, out natural_height);
+        a.x = content_allocation.x - BORDER_SIZE + CLOSE_OFFSET;
+        a.y = content_allocation.y - BORDER_SIZE + CLOSE_OFFSET;
+        a.width = minimum_width;
+        a.height = minimum_height;       
+        close_button.size_allocate (a);
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        if (corner_surface == null)
+        {
+            corner_surface = new Cairo.ImageSurface.from_png (Path.build_filename (Config.PKGDATADIR, "switcher_corner.png"));
+            left_surface = new Cairo.ImageSurface.from_png (Path.build_filename (Config.PKGDATADIR, "switcher_left.png"));
+            top_surface = new Cairo.ImageSurface.from_png (Path.build_filename (Config.PKGDATADIR, "switcher_top.png"));
+            corner_pattern = new Cairo.Pattern.for_surface (corner_surface);
+            left_pattern = new Cairo.Pattern.for_surface (left_surface);
+            left_pattern.set_extend (Cairo.Extend.REPEAT);
+            top_pattern = new Cairo.Pattern.for_surface (top_surface);
+            top_pattern.set_extend (Cairo.Extend.REPEAT);
+        }
+
+        var width = vbox.get_allocated_width () + 20 * 2 + BORDER_SIZE * 2;
+        var height = vbox.get_allocated_height () + 20 * 2 + BORDER_SIZE * 2;
+
+        /* Darken background */
+        c.set_source_rgba (0, 0, 0, 0.25);
+        c.paint ();
+
+        /* Draw dialog */
+        c.save ();
+        c.translate ((get_allocated_width () - width) * 0.5, (get_allocated_height () - height) * 0.5);
+
+        /* Top left */
+        var m = Cairo.Matrix.identity ();
+        corner_pattern.set_matrix (m);
+        c.set_source (corner_pattern);
+        c.rectangle (0, 0, BORDER_SIZE, BORDER_SIZE);
+        c.fill ();
+
+        /* Top right */
+        m = Cairo.Matrix.identity ();
+        m.translate (width, 0);
+        m.scale (-1, 1);
+        corner_pattern.set_matrix (m);
+        c.set_source (corner_pattern);
+        c.rectangle (width - BORDER_SIZE, 0, BORDER_SIZE, BORDER_SIZE);
+        c.fill ();
+
+        /* Bottom left */
+        m = Cairo.Matrix.identity ();
+        m.translate (0, height);
+        m.scale (1, -1);
+        corner_pattern.set_matrix (m);
+        c.set_source (corner_pattern);
+        c.rectangle (0, height - BORDER_SIZE, BORDER_SIZE, BORDER_SIZE);
+        c.fill ();
+
+        /* Bottom right */
+        m = Cairo.Matrix.identity ();
+        m.translate (width, height);
+        m.scale (-1, -1);
+        corner_pattern.set_matrix (m);
+        c.set_source (corner_pattern);
+        c.rectangle (width - BORDER_SIZE, height - BORDER_SIZE, BORDER_SIZE, BORDER_SIZE);
+        c.fill ();
+
+        /* Left */
+        m = Cairo.Matrix.identity ();
+        left_pattern.set_matrix (m);
+        c.set_source (left_pattern);
+        c.rectangle (0, BORDER_SIZE, BORDER_SIZE, height - BORDER_SIZE * 2);
+        c.fill ();
+
+        /* Right */
+        m = Cairo.Matrix.identity ();
+        m.translate (width, 0);
+        m.scale (-1, 1);
+        left_pattern.set_matrix (m);
+        c.set_source (left_pattern);
+        c.rectangle (width - BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, height - BORDER_SIZE * 2);
+        c.fill ();
+
+        /* Top */
+        m = Cairo.Matrix.identity ();
+        top_pattern.set_matrix (m);
+        c.set_source (top_pattern);
+        c.rectangle (BORDER_SIZE, 0, width - BORDER_SIZE * 2, BORDER_SIZE);
+        c.fill ();
+
+        /* Right */
+        m = Cairo.Matrix.identity ();
+        m.translate (0, height);
+        m.scale (1, -1);
+        top_pattern.set_matrix (m);
+        c.set_source (top_pattern);
+        c.rectangle (BORDER_SIZE, height - BORDER_SIZE, width - BORDER_SIZE * 2, BORDER_SIZE);
+        c.fill ();
+
+        /* Background */
+        DashBox.cairo_rounded_rectangle (c, 20, 20, width - 40, height - 40, 5);
+        c.set_source_rgba (0, 0, 0, 0.75);
+        c.fill ();
+       
+        c.restore ();
+
+        return base.draw (c);
+    }
+
+    public override bool button_press_event (Gdk.EventButton event)
+    {
+        /* Close when selecting the background */
+        // FIXME: Broken..
+        close ();
+        return true;
+    }
+
+    private DialogButton add_button (string text, string inactive_filename, string active_filename)
+    {
+        var b = new Gtk.Box (Gtk.Orientation.VERTICAL, 9);
+        b.visible = true;
+        button_box.pack_start (b, false, false, 0);
+
+        var label = new Gtk.Label (text);
+        label.visible = true;
+        label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+        label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
+        var button = new DialogButton (inactive_filename, active_filename, label);
+        button.visible = true;
+
+        b.pack_start (button, false, false, 0);
+        b.pack_start (label, false, false, 0);
+
+        return button;
+    }
+}
+
+private class DialogButton : Gtk.Button
+{
+    private string inactive_filename;
+    private string active_filename;
+    private Gtk.Image i;
+    private Gtk.Label? l;
+    
+    public DialogButton (string inactive_filename, string active_filename, Gtk.Label? label = null)
+    {
+        this.inactive_filename = inactive_filename;
+        this.active_filename = active_filename;
+        l = label;
+        relief = Gtk.ReliefStyle.NONE;
+        focus_on_click = false;
+        i = new Gtk.Image.from_file (inactive_filename);
+        i.visible = true;
+        add (i);
+    }
+    
+    public override bool enter_notify_event (Gdk.EventCrossing event)
+    {
+        grab_focus ();
+        return base.enter_notify_event (event);
+    }
+
+    public override bool leave_notify_event (Gdk.EventCrossing event)
+    {
+        (get_toplevel () as Gtk.Window).set_focus (null);
+        return base.leave_notify_event (event);
+    }
+
+    public override bool focus_in_event (Gdk.EventFocus event)
+    {
+        i.set_from_file (active_filename);
+        if (l != null)
+            l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
+        return base.focus_in_event (event);
+    }
+
+    public override bool focus_out_event (Gdk.EventFocus event)
+    {
+        i.set_from_file (inactive_filename);
+        if (l != null)
+            l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
+        return base.focus_out_event (event);
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        i.draw (c);
+        return true;
+    }
+}

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2013-10-02 17:46:49 +0000
+++ src/unity-greeter.vala	2013-11-05 04:15:26 +0000
@@ -46,6 +46,8 @@
 
     private static Timer log_timer;
 
+    private DialogDBusInterface dbus_object;
+
     private UnityGreeter (bool test_mode_)
     {
         singleton = this;
@@ -98,6 +100,38 @@
 
         main_window = new MainWindow ();
 
+        dbus_object = new DialogDBusInterface ();
+        dbus_object.open_dialog.connect ((type) =>
+        {
+            ShutdownDialogType dialog_type;
+            switch (type)
+            {
+            default:
+            case 1:
+                dialog_type = ShutdownDialogType.LOGOUT;
+                break;
+            case 2:
+                dialog_type = ShutdownDialogType.RESTART;
+                break;
+            }
+            main_window.show_shutdown_dialog (dialog_type);
+        });
+        dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); });
+        Bus.own_name (BusType.SESSION, "com.canonical.Unity", BusNameOwnerFlags.NONE,
+                      (c) =>
+                      {
+                          try
+                          {
+                              c.register_object ("/org/gnome/SessionManager/EndSessionDialog", dbus_object);
+                          }
+                          catch (Error e)
+                          {
+                              warning ("Failed to register /org/gnome/SessionManager/EndSessionDialog: %s", e.message);
+                          }
+                      },
+                      null,
+                      () => debug ("Failed to acquire name com.canonical.Unity"));
+
         start_fake_wm ();
         Gdk.threads_add_idle (ready_cb);
     }
@@ -535,3 +569,20 @@
         return Posix.EXIT_SUCCESS;
     }
 }
+
+[DBus (name="org.gnome.SessionManager.EndSessionDialog")]
+public class DialogDBusInterface : Object
+{
+    public signal void open_dialog (uint32 type);
+    public signal void close_dialog ();
+
+    public void open (uint32 type, uint32 timestamp, uint32 seconds_to_stay_open, ObjectPath[] inhibitor_object_paths)
+    {
+        open_dialog (type);
+    }
+
+    public void close ()
+    {
+        close_dialog ();
+    }
+}

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-10-17 22:09:16 +0000
+++ tests/Makefile.am	2013-11-05 04:15:26 +0000
@@ -34,7 +34,8 @@
 	../src/session-list.vala \
 	../src/main-window.vala \
 	../src/list-stack.vala \
-	../src/settings.vala
+	../src/settings.vala \
+	../src/shutdown-dialog.vala
 
 
 unity_greeter_test_CFLAGS = \