summaryrefslogtreecommitdiff
path: root/src/seat-unity.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/seat-unity.c')
-rw-r--r--src/seat-unity.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/seat-unity.c b/src/seat-unity.c
index 32d30b23..642be0aa 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -203,9 +203,11 @@ create_x_server (Seat *seat)
x_server = x_server_local_new ();
- command = seat_get_string_property (seat, "xserver-command");
- if (command)
- x_server_local_set_command (x_server, command);
+ command = seat_get_string_property (seat, "xmir-command");
+ /* Fall back to using X if Xmir is not available as this was the previous way XMir worked */
+ if (strcmp (command, "Xmir") == 0 && !g_find_program_in_path ("Xmir"))
+ command = seat_get_string_property (seat, "xserver-command");
+ x_server_local_set_command (x_server, command);
id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id);
SEAT_UNITY (seat)->priv->next_x_server_id++;