← Back to branch summary

~albertomilone/gdm/lp1697882

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_prefer_x11_session.patch

  • Committer: Didier Roche
  • Date: 2017-08-21 08:48:14 UTC
  • Revision ID: didier.roche@canonical.com-20170821084814-po0l5lqgfgnhtou5
* debian/patches/ubuntu_prefer_x11_session.patch:
  - remove x11 session preference now that both Ubuntu and GNOME
    switched to wayland

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_prefer_x11_session.patch
1
 
Description: Prefer X11 session over wayland
2
 
 As we are not ready yet for switching to wayland, let's prefer X11
3
 
 session when no specific choice was made.
4
 
 This will be reverted once we switch to wayland by default.
5
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1703601
6
 
Forwarded: not-needed
7
 
Author: Didier Roche <didrocks@ubuntu.com>
8
 
 
9
 
Index: gdm3/daemon/gdm-session.c
10
 
===================================================================
11
 
--- gdm3.orig/daemon/gdm-session.c
12
 
+++ gdm3/daemon/gdm-session.c
13
 
@@ -359,11 +359,7 @@ get_system_session_dirs (GdmSession *sel
14
 
 
15
 
 #ifdef ENABLE_WAYLAND_SUPPORT
16
 
         if (!self->priv->ignore_wayland) {
17
 
-#ifdef ENABLE_USER_DISPLAY_SERVER
18
 
-                g_array_prepend_val (search_array, wayland_search_dir);
19
 
-#else
20
 
                 g_array_append_val (search_array, wayland_search_dir);
21
 
-#endif
22
 
         }
23
 
 #endif
24