summaryrefslogtreecommitdiff
path: root/daemon/gdm-session.c
diff options
context:
space:
mode:
authorDaniel van Vugt <daniel.van.vugt@canonical.com>2017-07-13 16:13:05 +0800
committerRay Strode <rstrode@redhat.com>2017-07-17 09:54:53 -0400
commitd81a471da9b80b53fa42a4c180a91007368463d8 (patch)
tree18be2a362d781815a29dae7463a0955315dde346 /daemon/gdm-session.c
parent80733cb20314eb26c31912fdd432a9b79338a017 (diff)
downloadgdm-d81a471da9b80b53fa42a4c180a91007368463d8.tar.gz
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
Diffstat (limited to 'daemon/gdm-session.c')
-rw-r--r--daemon/gdm-session.c1
1 files changed, 0 insertions, 1 deletions
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/";