Commit | Line | Data |
---|---|---|
f4ec5e1a LC |
1 | This patch ensures '.desktop' files are picked up in the system profile |
2 | and not in the directories listed in $XDG_DATA_DIRS. The latter includes | |
3 | 'gnome-session.desktop', which should be used if it's in | |
4 | /run/current-system/profile, and only then. | |
5 | ||
6 | Fixes <https://bugs.gnu.org/37831>. | |
7 | ||
45b320d9 KK |
8 | diff -ur a/daemon/gdm-session.c b/daemon/gdm-session.c |
9 | --- a/daemon/gdm-session.c 2019-09-25 10:40:24.000000000 -0400 | |
10 | +++ b/daemon/gdm-session.c 2020-04-18 18:30:02.671856808 -0400 | |
11 | @@ -348,24 +348,18 @@ | |
f4ec5e1a LC |
12 | GArray *search_array = NULL; |
13 | char **search_dirs; | |
14 | int i; | |
15 | - const gchar * const *system_data_dirs = g_get_system_data_dirs (); | |
16 | ||
17 | static const char *x_search_dirs[] = { | |
18 | "/etc/X11/sessions/", | |
19 | DMCONFDIR "/Sessions/", | |
20 | DATADIR "/gdm/BuiltInSessions/", | |
21 | - DATADIR "/xsessions/", | |
22 | + "/run/current-system/profile/share/xsessions/" | |
23 | }; | |
24 | ||
25 | static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; | |
26 | ||
27 | search_array = g_array_new (TRUE, TRUE, sizeof (char *)); | |
28 | ||
29 | - for (i = 0; system_data_dirs[i]; i++) { | |
30 | - gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); | |
31 | - g_array_append_val (search_array, dir); | |
32 | - } | |
33 | - | |
34 | g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); | |
35 | ||
36 | #ifdef ENABLE_WAYLAND_SUPPORT | |
45b320d9 | 37 | @@ -373,16 +367,7 @@ |
f4ec5e1a LC |
38 | #ifdef ENABLE_USER_DISPLAY_SERVER |
39 | g_array_prepend_val (search_array, wayland_search_dir); | |
40 | ||
41 | - for (i = 0; system_data_dirs[i]; i++) { | |
42 | - gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); | |
43 | - g_array_insert_val (search_array, i, dir); | |
44 | - } | |
45 | #else | |
46 | - for (i = 0; system_data_dirs[i]; i++) { | |
47 | - gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); | |
48 | - g_array_append_val (search_array, dir); | |
49 | - } | |
50 | - | |
51 | g_array_append_val (search_array, wayland_search_dir); | |
52 | #endif | |
53 | } | |
45b320d9 KK |
54 | diff -ur a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c |
55 | --- a/libgdm/gdm-sessions.c 2019-10-07 04:53:35.000000000 -0400 | |
56 | +++ b/libgdm/gdm-sessions.c 2020-04-18 18:31:42.491348691 -0400 | |
57 | @@ -245,19 +245,12 @@ | |
f4ec5e1a LC |
58 | "/etc/X11/sessions/", |
59 | DMCONFDIR "/Sessions/", | |
60 | DATADIR "/gdm/BuiltInSessions/", | |
61 | - DATADIR "/xsessions/", | |
f4ec5e1a LC |
62 | + "/run/current-system/profile/share/xsessions/" |
63 | }; | |
64 | ||
45b320d9 KK |
65 | names_seen_before = g_hash_table_new (g_str_hash, g_str_equal); |
66 | xorg_search_array = g_ptr_array_new_with_free_func (g_free); | |
f4ec5e1a LC |
67 | |
68 | - const gchar * const *system_data_dirs = g_get_system_data_dirs (); | |
69 | - | |
70 | - for (i = 0; system_data_dirs[i]; i++) { | |
71 | - session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); | |
45b320d9 | 72 | - g_ptr_array_add (xorg_search_array, session_dir); |
f4ec5e1a LC |
73 | - } |
74 | - | |
45b320d9 KK |
75 | for (i = 0; i < G_N_ELEMENTS (xorg_search_dirs); i++) { |
76 | g_ptr_array_add (xorg_search_array, g_strdup (xorg_search_dirs[i])); | |
77 | } | |
78 | @@ -269,11 +262,6 @@ | |
f4ec5e1a | 79 | |
45b320d9 | 80 | wayland_search_array = g_ptr_array_new_with_free_func (g_free); |
f4ec5e1a LC |
81 | |
82 | - for (i = 0; system_data_dirs[i]; i++) { | |
83 | - session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); | |
45b320d9 | 84 | - g_ptr_array_add (wayland_search_array, session_dir); |
f4ec5e1a LC |
85 | - } |
86 | - | |
45b320d9 KK |
87 | for (i = 0; i < G_N_ELEMENTS (wayland_search_dirs); i++) { |
88 | g_ptr_array_add (wayland_search_array, g_strdup (wayland_search_dirs[i])); | |
89 | } |