From 15812a73c9fdbab6d8e7a1da8f9c511a8ad716f249399a1378ca040e229e0cb7 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 2 Nov 2017 08:20:22 +0000
Subject: [PATCH] Accepting request 538216 from
 home:xiaoguang_wang:branches:GNOME:Factory

- Update gdm-ignore-duplicate-session.patch: Fix patch doesn't work
  when wayland is disabled (bsc#1060627).

OBS-URL: https://build.opensuse.org/request/show/538216
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=363
---
 gdm-ignore-duplicate-session.patch | 42 +++++++++++++++++++-----------
 gdm.changes                        |  6 +++++
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/gdm-ignore-duplicate-session.patch b/gdm-ignore-duplicate-session.patch
index 117f58f..bc389be 100644
--- a/gdm-ignore-duplicate-session.patch
+++ b/gdm-ignore-duplicate-session.patch
@@ -1,8 +1,8 @@
-diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
-index 4a5434ed..08829f6f 100644
---- a/libgdm/gdm-sessions.c
-+++ b/libgdm/gdm-sessions.c
-@@ -184,9 +184,22 @@ collect_sessions_from_directory (const char *dirname)
+Index: gdm-3.26.2.1/libgdm/gdm-sessions.c
+===================================================================
+--- gdm-3.26.2.1.orig/libgdm/gdm-sessions.c
++++ gdm-3.26.2.1/libgdm/gdm-sessions.c
+@@ -202,6 +202,34 @@ collect_sessions_from_directory (const c
          g_dir_close (dir);
  }
  
@@ -17,18 +17,11 @@ index 4a5434ed..08829f6f 100644
 +        return g_str_equal (session->translated_name, translated_name) ? TRUE : FALSE;
 +}
 +
- static void
- collect_sessions (void)
- {
++static void
++remove_duplicated_session_name (void)
++{
 +        GdmSessionFile *session;
 +        char           *translated_name = NULL;
-         int         i;
-         const char *xorg_search_dirs[] = {
-                 "/etc/X11/sessions/",
-@@ -223,6 +236,16 @@ collect_sessions (void)
-                 collect_sessions_from_directory (wayland_search_dirs [i]);
-         }
- #endif
 +
 +        session = g_hash_table_lookup (gdm_available_sessions_map, "default");
 +        if (session)
@@ -39,6 +32,25 @@ index 4a5434ed..08829f6f 100644
 +                if (session)
 +                        g_hash_table_remove (gdm_available_sessions_map, session->id);
 +        }
++}
++
+ static void
+ collect_sessions (void)
+ {
+@@ -233,6 +261,7 @@ collect_sessions (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ #ifdef ENABLE_USER_DISPLAY_SERVER
+         if (g_getenv ("WAYLAND_DISPLAY") == NULL && g_getenv ("RUNNING_UNDER_GDM") != NULL) {
++                remove_duplicated_session_name();
+                 return;
+         }
+ #endif
+@@ -241,6 +270,8 @@ collect_sessions (void)
+                 collect_sessions_from_directory (wayland_search_dirs [i]);
+         }
+ #endif
++
++        remove_duplicated_session_name();
  }
  
  /**
diff --git a/gdm.changes b/gdm.changes
index becb6f9..a5bf114 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov  2 01:53:56 UTC 2017 - xwang@suse.com
+
+- Update gdm-ignore-duplicate-session.patch: Fix patch doesn't work
+  when wayland is disabled (bsc#1060627).
+
 -------------------------------------------------------------------
 Wed Nov  1 14:02:31 UTC 2017 - fezhang@suse.com