1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Remove check for hardcoded Xwayland path in gdm.
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 7de7b99c..065325f4 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -261,11 +261,11 @@ struct GdmDisplayServerConfiguration {
const char *session_type;
} display_server_configuration[] = {
#ifdef ENABLE_WAYLAND_SUPPORT
- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "", "wayland" },
#endif
#ifdef ENABLE_X11_SUPPORT
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
+ { "xorg", GDM_KEY_XORG_ENABLE, "", "x11" },
#endif
{ NULL, NULL, NULL },
};
@@ -289,11 +289,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory,
return FALSE;
#endif
-#ifdef ENABLE_X11_SUPPORT
- if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE))
- return FALSE;
-#endif
-
return TRUE;
}
|
