From: Michael Terry <michael.terry@canonical.com>
Date: Tue, 19 Nov 2013 20:36:36 +0000 (-0500)
Subject: Allow mir sessions inside a surfaceflinger seat
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/bc7d18559e4c49d0576ad554841ed78ed4a7b65c

Allow mir sessions inside a surfaceflinger seat
---

diff --git a/src/seat-surfaceflinger.c b/src/seat-surfaceflinger.c
index 02509309..226c5113 100644
--- a/src/seat-surfaceflinger.c
+++ b/src/seat-surfaceflinger.c
@@ -26,8 +26,10 @@ seat_surfaceflinger_setup (Seat *seat)
 
 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
     {