Merge lp:~robert-ancell/unity-greeter/handle-failed-session-start into lp:unity-greeter

[Robert Ancell]

Correctly handle session not starting

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/fixes.vapi'
--- src/fixes.vapi	2014-04-04 03:58:04 +0000
+++ src/fixes.vapi	2014-04-08 01:29:50 +0000
@@ -49,3 +49,9 @@
 
     public delegate void IdleMonitorWatchFunc (IdleMonitor monitor, uint id);
 }
+
+// Note, fixed in 1.10.0
+namespace LightDM
+{
+    bool greeter_start_session_sync (LightDM.Greeter greeter, string session) throws GLib.Error;
+}

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2014-03-26 04:41:10 +0000
+++ src/greeter-list.vala	2014-04-08 01:29:50 +0000
@@ -908,11 +908,16 @@
 
     private void start_session ()
     {
+        if (!UnityGreeter.singleton.start_session (get_lightdm_session (), background))
+        {
+            show_message (_("Failed to start session"), true);
+            start_authentication ();
+            return;
+        }
+
         /* Set the background */
         background.draw_grid = false;
         background.queue_draw ();
-
-        UnityGreeter.singleton.start_session (get_lightdm_session (), background);
     }
 
     public void login_complete ()

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2014-04-04 03:58:04 +0000
+++ src/unity-greeter.vala	2014-04-08 01:29:50 +0000
@@ -181,7 +181,7 @@
         ctx.add_class ("lightdm");
     }
 
-    public void start_session (string? session, Background bg)
+    public bool start_session (string? session, Background bg)
     {
         /* Paint our background onto the root window before we close our own window */
         var c = new Cairo.Context (background_surface);
@@ -191,21 +191,25 @@
 
         if (test_mode)
         {
-                debug ("Successfully logged in!  Quitting...");
-                Gtk.main_quit ();
-        }
-        else
-        {
+            debug ("Successfully logged in! Quitting...");
+            Gtk.main_quit ();
+            return true;
+        }
+
+        var result = false;
+        try
+        {
+            result = LightDM.greeter_start_session_sync (greeter, session);
+        }
+        catch (Error e)
+        {
+            warning ("Failed to start session: %s", e.message);
+        }
+
+        if (result)
             starting_session ();
-            try
-            {
-                greeter.start_session_sync (session);
-            }
-            catch (Error e)
-            {
-                warning ("Failed to start session: %s", e.message);
-            }
-        }
+
+        return result;
     }
 
     private bool ready_cb ()

=== modified file 'tests/unity-greeter.vala'
--- tests/unity-greeter.vala	2013-10-02 17:46:49 +0000
+++ tests/unity-greeter.vala	2014-04-08 01:29:50 +0000
@@ -97,9 +97,10 @@
         return _has_guest_account_hint;
     }
 
-    public void start_session (string? session, Background bg)
+    public bool start_session (string? session, Background bg)
     {
         session_started = true;
+        return true;
     }
 
     public void push_list (GreeterList widget)