]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Add in handling of "plymouth quit" when using the compositor to send the plymouth...
authorChris Townsend <christopher.townsend@canonical.com>
Fri, 19 Jul 2013 11:05:23 +0000 (23:05 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Fri, 19 Jul 2013 11:05:23 +0000 (23:05 +1200)
src/seat-unity.c

index d065cbed476bc9422a048954642e823b281f6b2b..a5ef79f6eafcaa7dc45362b9d7de2013fa845a2d 100644 (file)
@@ -146,6 +146,12 @@ compositor_run_cb (Process *process, SeatUnity *seat)
              close (fd);
          }
     }
+
+    if (seat->priv->stopping_plymouth)
+    {      
+        seat->priv->stopping_plymouth = FALSE;
+        plymouth_quit (TRUE);
+    }  
 }
 
 static void
@@ -309,6 +315,7 @@ seat_unity_start (Seat *seat)
         if (active_vt >= vt_get_min ())
         {
             g_debug ("Compositor will replace Plymouth");
+            SEAT_UNITY (seat)->priv->stopping_plymouth = TRUE;
             SEAT_UNITY (seat)->priv->vt = active_vt;
             plymouth_deactivate ();
         }