Bjørn Lie
0cb3aa30d9
- Add gdm-ignore-duplicate-desktop-file.patch to ignore duplicate desktop file with same "Name" value, including symlinks of desktop files (bsc#1112834, glgo#GNOME/gdm#437). - Drop gdm-ignore-duplicate-session.patch, the patch hardcodes "default.desktop" while LightDM and SDDM treat symlinks as aliases. OBS-URL: https://build.opensuse.org/request/show/660933 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=418
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
|
|
index 7badafe..2aafce1 100644
|
|
--- a/libgdm/gdm-sessions.c
|
|
+++ b/libgdm/gdm-sessions.c
|
|
@@ -111,6 +111,17 @@ key_file_is_relevant (GKeyFile *key_file)
|
|
return TRUE;
|
|
}
|
|
|
|
+static gboolean
|
|
+find_translated_name (gpointer key,
|
|
+ gpointer value,
|
|
+ gpointer user_data)
|
|
+{
|
|
+ char *id = key;
|
|
+ GdmSessionFile *session = value;
|
|
+ char *translated_name = user_data;
|
|
+ return g_strcmp0 (session->translated_name, translated_name) == 0;
|
|
+}
|
|
+
|
|
static void
|
|
load_session_file (const char *id,
|
|
const char *path)
|
|
@@ -118,7 +129,7 @@ load_session_file (const char *id,
|
|
GKeyFile *key_file;
|
|
GError *error;
|
|
gboolean res;
|
|
- GdmSessionFile *session;
|
|
+ GdmSessionFile *session, *psession;
|
|
|
|
key_file = g_key_file_new ();
|
|
|
|
@@ -154,9 +165,13 @@ load_session_file (const char *id,
|
|
session->translated_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Name", NULL, NULL);
|
|
session->translated_comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Comment", NULL, NULL);
|
|
|
|
- g_hash_table_insert (gdm_available_sessions_map,
|
|
- g_strdup (id),
|
|
- session);
|
|
+ psession = g_hash_table_find (gdm_available_sessions_map, find_translated_name, session->translated_name);
|
|
+
|
|
+ if(psession)
|
|
+ g_hash_table_remove (gdm_available_sessions_map, psession->id);
|
|
+
|
|
+ g_hash_table_insert (gdm_available_sessions_map, g_strdup (id), session);
|
|
+
|
|
out:
|
|
g_key_file_free (key_file);
|
|
}
|