]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Allow mir sessions inside a surfaceflinger seat
authorMichael Terry <michael.terry@canonical.com>
Tue, 19 Nov 2013 20:36:36 +0000 (15:36 -0500)
committerMichael Terry <michael.terry@canonical.com>
Tue, 19 Nov 2013 20:36:36 +0000 (15:36 -0500)
src/seat-surfaceflinger.c

index 025093091a811e0f29c5621c8c47bb645bfd7b85..226c51136a84c689427f489ff1b946db2923b562 100644 (file)
@@ -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
     {