Merge lp:~mterry/lightdm/activate-after-unlocking into lp:lightdm

[Michael Terry]

Call Activate() after Unlock() when unlocking a logind session. This ensures that no matter the display server, the session will be active.

Call Activate() after Unlock() when unlocking a logind session. This ensures that no matter the display server, the session will be active.

X11 does it automatically because logind seems to track VT switches. But for Mir or some other display server, we need to make sure it happens. Since it's good to be explicit even for X11, we just unconditionally do it here.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1932
http://jenkins.qa.ubuntu.com/job/lightdm-ci/256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/256/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Seems to work fine for me.

review: Approve

=== modified file 'src/login1.c'
--- src/login1.c	2013-04-23 22:58:23 +0000
+++ src/login1.c	2014-03-17 02:33:31 +0000
@@ -136,8 +136,28 @@
         if (error)
             g_warning ("Error unlocking login1 session: %s", error->message);
         g_clear_error (&error);
+
         if (result)
+        {
             g_variant_unref (result);
+
+            result = g_dbus_connection_call_sync (bus,
+                                                  "org.freedesktop.login1",
+                                                  session_path,
+                                                  "org.freedesktop.login1.Session",
+                                                  "Activate",
+                                                  g_variant_new ("()"),
+                                                  G_VARIANT_TYPE ("()"),
+                                                  G_DBUS_CALL_FLAGS_NONE,
+                                                  -1,
+                                                  NULL,
+                                                  &error);
+            if (error)
+                g_warning ("Error activating login1 session: %s", error->message);
+            g_clear_error (&error);
+            if (result)
+                g_variant_unref (result);
+        }
     }
     g_object_unref (bus);
 }