From d81a471da9b80b53fa42a4c180a91007368463d8 Mon Sep 17 00:00:00 2001 From: Daniel van Vugt Date: Thu, 13 Jul 2017 16:13:05 +0800 Subject: session: ensure wayland paths get searched even with --disable-user-display-server get_system_session_dirs is function that says which directories to search for session desktop files. The returned directories may be xsession dirs, wayland-session dirs, or both, depending on configuration. A bug in this function means an unused NULL sentinal value from the xsession list of directories is getting copied into the middle of the output list, when --disable-user-display-server is passed to configure. This commit corrects the bug, by dropping the unused sentinal value. Launchpad-Bug: 1704050 https://bugzilla.gnome.org/show_bug.cgi?id=784891 --- daemon/gdm-session.c | 1 - 1 file changed, 1 deletion(-) diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index ff3a1acb..0b832231 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -348,7 +348,6 @@ get_system_session_dirs (GdmSession *self) DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", DATADIR "/xsessions/", - NULL }; static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; -- cgit v1.2.1