]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Wait 60s for unity-system-compositor to start by default.
authorChristopher James Halse Rogers <raof@ubuntu.com>
Thu, 20 Jun 2013 02:40:02 +0000 (12:40 +1000)
committerChristopher James Halse Rogers <raof@ubuntu.com>
Thu, 20 Jun 2013 02:40:02 +0000 (12:40 +1000)
The default was 5s, and it was taking 5.2s to start, causing LightDM to SIGKILL u-s-c
and me all maner of confusion.

If unity-system-compositor isn't responding in 60s, it's probably not going to.

src/seat-unity.c

index f28bd90472745c6a75cf612a4031aa58a5d7ec12..9ac25fa72cbe24b424f7740772ffcb99855de0a4 100644 (file)
@@ -365,7 +365,7 @@ seat_unity_start (Seat *seat)
     /* Connect to the compositor */
     timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
     if (timeout <= 0)
-        timeout = 5;
+        timeout = 60;
     g_debug ("Waiting for system compositor for %ds", timeout);
     SEAT_UNITY (seat)->priv->compositor_timeout = g_timeout_add (timeout * 1000, compositor_timeout_cb, seat);