diff options
| -rw-r--r-- | liblightdm-gobject/Makefile.am | 1 | ||||
| -rw-r--r-- | liblightdm-gobject/session.c | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/seat.c | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am index fe3f9edf..fc672dad 100644 --- a/liblightdm-gobject/Makefile.am +++ b/liblightdm-gobject/Makefile.am @@ -9,7 +9,6 @@ liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \ -I"$(top_srcdir)/common" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \ - -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \ -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" mainheader_HEADERS = lightdm.h diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c index 8608c41f..73eb88e7 100644 --- a/liblightdm-gobject/session.c +++ b/liblightdm-gobject/session.c @@ -171,7 +171,7 @@ load_sessions (const gchar *sessions_dir) { const gchar *default_type = "x"; - if (strcmp (dirs[i], WAYLAND_SESSIONS_DIR) == 0) + if (dirs[i] != NULL && g_str_has_suffix (dirs[i], "/wayland-sessions") == TRUE) default_type = "wayland"; sessions = load_sessions_dir (sessions, dirs[i], default_type); diff --git a/src/Makefile.am b/src/Makefile.am index d87b0183..834f7bb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,6 @@ lightdm_CFLAGS = \ -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \ - -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \ -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" lightdm_LDADD = \ @@ -956,7 +956,7 @@ find_session_config (Seat *seat, const gchar *sessions_dir, const gchar *session for (int i = 0; dirs[i]; i++) { const gchar *default_session_type = "x"; - if (strcmp (dirs[i], WAYLAND_SESSIONS_DIR) == 0) + if (dirs[i] != NULL && g_str_has_suffix (dirs[i], "/wayland-sessions") == TRUE) default_session_type = "wayland"; g_autofree gchar *filename = g_strdup_printf ("%s.desktop", session_name); |