← Back to branch summary

~didrocks/lightdm/packaging-cleanup

« back to all changes in this revision

Viewing changes to src/seat-unity.c

Add option to set compositor command.

Approved by Chris Halse Rogers, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/seat-unity.c
293
293
static gboolean
294
294
seat_unity_start (Seat *seat)
295
295
{
 
296
    const gchar *compositor_command;
296
297
    gchar *command, *absolute_command, *dir;
297
298
    gboolean result;
298
299
    int timeout;
341
342
    g_free (dir);
342
343
 
343
344
    SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
344
 
    command = g_strdup_printf ("unity-system-compositor --from-dm-fd %d --to-dm-fd %d", SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1]);
 
345
    timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
 
346
    compositor_command = seat_get_string_property (seat, "unity-compositor-command");
 
347
    command = g_strdup_printf ("%s --from-dm-fd %d --to-dm-fd %d", compositor_command, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1]);
345
348
 
346
349
    absolute_command = get_absolute_command (command);
347
350
    g_free (command);