Determine a session is wayland with a better heuristic

worldofpeace · robert-ancell · commit 03f218981733 · 2019-12-10T16:48:39.000+13:00
Using the compiled in string WAYLAND_SESSIONS_DIR had some problems.
In environments like NixOS, which install packages under their
own immutable prefix under /nix/store. this assumption that the package
would be compiled with `datadir=/usr/share` will break down. Checking
if the directory contains the appropriate string is much simpler and will
work with platforms like NixOS (or others as this setup popularizes).
diff --git 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
@@ -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
@@ -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 = \
diff --git a/src/seat.c b/src/seat.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ load_sessions (const gchar *sessions_dir)`
`171`	`171`	`{`
`172`	`172`	`const gchar *default_type = "x";`
`173`	`173`
`174`		`- if (strcmp (dirs[i], WAYLAND_SESSIONS_DIR) == 0)`
	`174`	`+ if (dirs[i] != NULL && g_str_has_suffix (dirs[i], "/wayland-sessions") == TRUE)`
`175`	`175`	`default_type = "wayland";`
`176`	`176`
`177`	`177`	`sessions = load_sessions_dir (sessions, dirs[i], default_type);`
Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ find_session_config (Seat seat, const gchar sessions_dir, const gchar *session`
`956`	`956`	`for (int i = 0; dirs[i]; i++)`
`957`	`957`	`{`
`958`	`958`	`const gchar *default_session_type = "x";`
`959`		`- if (strcmp (dirs[i], WAYLAND_SESSIONS_DIR) == 0)`
	`959`	`+ if (dirs[i] != NULL && g_str_has_suffix (dirs[i], "/wayland-sessions") == TRUE)`
`960`	`960`	`default_session_type = "wayland";`
`961`	`961`
`962`	`962`	`g_autofree gchar *filename = g_strdup_printf ("%s.desktop", session_name);`