Merge lp:~mterry/lightdm/mir-in-sf-seat into lp:lightdm

[Michael Terry]

Allow "mir" session types in a "surfaceflinger" seat.

Allow "mir" session types in a "surfaceflinger" seat.

This is mostly just convenience for the phone. Mir sessions (of which there is only unity8 right now?) all allow surfaceflinger as a fallback, because they need to support both on the phone.

Supporting "mir" types means that we don't have to ship two desktop session files that only differ in their type field.

And it means that if/when https://code.launchpad.net/~mterry/lightdm/type-fallback/+merge/195674 lands, we can actually do:

[SeatDefaults]
type=unity;surfaceflinger

And the same mir session can work in both seat types.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Sure

review: Approve

=== modified file 'src/seat-surfaceflinger.c'
--- src/seat-surfaceflinger.c	2013-09-24 17:49:08 +0000
+++ src/seat-surfaceflinger.c	2013-11-19 20:43:54 +0000
@@ -26,8 +26,10 @@
 
 static DisplayServer *
 seat_surfaceflinger_create_display_server (Seat *seat, const gchar *session_type)
-{  
-    if (strcmp (session_type, "surfaceflinger") == 0)
+{
+    /* Allow mir types too, because Mir sessions usually support surfaceflinger
+       as an alternate mode, since Mir is frequently used on phones. */
+    if (strcmp (session_type, "surfaceflinger") == 0 || strcmp (session_type, "mir") == 0)
         return DISPLAY_SERVER (surfaceflinger_server_new ());
     else
     {