diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-04 15:26:53 +0200 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2018-08-27 13:33:11 +0000 |
| commit | 385b9c22b638793403a734a5e3bf34406491c0e6 (patch) | |
| tree | 3a40c499abc306b67ed16da8387ac8562b8202e9 /daemon/gdm-session.c | |
| parent | 68e764b9b93fb1b610e0c200acb8e3558fdde79c (diff) | |
| download | gdm-385b9c22b638793403a734a5e3bf34406491c0e6.tar.gz | |
Search sessions in XDG_DATA_DIRS
Diffstat (limited to 'daemon/gdm-session.c')
| -rw-r--r-- | daemon/gdm-session.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 19d26c92..600da0f3 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -343,6 +343,8 @@ get_system_session_dirs (GdmSession *self) { GArray *search_array = NULL; char **search_dirs; + int i; + const gchar * const *system_data_dirs = g_get_system_data_dirs (); static const char *x_search_dirs[] = { "/etc/X11/sessions/", @@ -355,13 +357,28 @@ get_system_session_dirs (GdmSession *self) search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + for (i = 0; system_data_dirs[i]; i++) { + gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); + g_array_append_val (search_array, dir); + } + g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); #ifdef ENABLE_WAYLAND_SUPPORT if (!self->priv->ignore_wayland) { #ifdef ENABLE_USER_DISPLAY_SERVER g_array_prepend_val (search_array, wayland_search_dir); + + for (i = 0; system_data_dirs[i]; i++) { + gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); + g_array_insert_val (search_array, i, dir); + } #else + for (i = 0; system_data_dirs[i]; i++) { + gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); + g_array_append_val (search_array, dir); + } + g_array_append_val (search_array, wayland_search_dir); #endif } |