[gdm] session: ensure wayland paths get searched even with --disable-user-display-server



commit d81a471da9b80b53fa42a4c180a91007368463d8
Author: Daniel van Vugt <daniel van vugt canonical com>
Date:   Thu Jul 13 16:13:05 2017 +0800

    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 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index ff3a1ac..0b83223 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/";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]