[gnome-session/gnome-3-20] data: switch back to Xorg by default

[Ray Strode <halfline src gnome org>]

commit 101dc244a6f77acbae1c5c2e60665810ed295476
Author: Ray Strode <rstrode redhat com>
Date:   Mon Mar 7 13:36:32 2016 -0500

    data: switch back to Xorg by default
    
    Consensus seems to be that switching to wayland for user sessions
    by default is a bit premature.
    
    This commit moves it back to Xorg by default.
    
    We'll save wayland by default for 3.22
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763266

 data/Makefile.am                                   |    4 ++--
 ...me-xorg.desktop.in => gnome-wayland.desktop.in} |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a171dfc..410988e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ hwcompatdir = $(pkgdatadir)
 hwcompat_DATA = hardware-compatibility
 
 xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
+xsession_in_files = gnome.desktop.in
 
 if BUILD_SESSION_SELECTOR
 xsession_in_files += gnome-custom-session.desktop.in
@@ -21,7 +21,7 @@ endif
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
 wayland_sessiondir = $(datadir)/wayland-sessions
-wayland_session_in_files = gnome.desktop.in
+wayland_session_in_files = gnome-wayland.desktop.in
 wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
 
 sessiondir = $(datadir)/gnome-session/sessions
diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
similarity index 85%
rename from data/gnome-xorg.desktop.in
rename to data/gnome-wayland.desktop.in
index d00b3dc..852be87 100644
--- a/data/gnome-xorg.desktop.in
+++ b/data/gnome-wayland.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=GNOME on Xorg
+_Name=GNOME on Wayland
 _Comment=This session logs you into GNOME
 Exec=gnome-session
 TryExec=gnome-session