From b8e29ae8c78658917c8a8ddd391667d7d9e36971 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 17 Dec 2014 12:31:38 -0500
Subject: [PATCH] data: merge gnome-shell.desktop and
 gnome-shell-wayland.desktop into one file

We can autodetect what to do based on the user's session, so drop
the separate desktop files.

This, along with some future changes, will enable us to be bus
activatable.

https://bugzilla.gnome.org/show_bug.cgi?id=741666
---
 .gitignore                                        |  6 ++----
 data/Makefile.am                                  |  8 +++-----
 data/gnome-shell-wayland.desktop.in.in            | 15 ---------------
 ...esktop.in.in => org.gnome.Shell.desktop.in.in} |  2 +-
 man/gnome-shell.xml                               |  2 +-
 5 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 data/gnome-shell-wayland.desktop.in.in
 rename data/{gnome-shell.desktop.in.in => org.gnome.Shell.desktop.in.in} (91%)

diff --git a/.gitignore b/.gitignore
index c1eddbffa..f39b4775c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,8 @@ config.status
 config
 configure
 data/50-gnome-shell-*.xml
-data/gnome-shell.desktop
-data/gnome-shell.desktop.in
-data/gnome-shell-wayland.desktop
-data/gnome-shell-wayland.desktop.in
+data/org.gnome.Shell.desktop
+data/org.gnome.Shell.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
 data/gnome-shell-theme.gresource
diff --git a/data/Makefile.am b/data/Makefile.am
index 7f7ee4b78..7adb5beb9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES =
 NULL =
 
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
+desktop_DATA = org.gnome.Shell.desktop gnome-shell-extension-prefs.desktop
 
 if HAVE_NETWORKMANAGER
 desktop_DATA += org.gnome.Shell.PortalHelper.desktop
@@ -104,8 +104,7 @@ convertdir = $(datadir)/GConf/gsettings
 convert_DATA = gnome-shell-overrides.convert
 
 EXTRA_DIST =						\
-	gnome-shell.desktop.in.in			\
-	gnome-shell-wayland.desktop.in.in		\
+	org.gnome.Shell.desktop.in.in			\
 	gnome-shell-extension-prefs.desktop.in.in	\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
@@ -121,8 +120,7 @@ EXTRA_DIST =						\
 	$(NULL)
 
 CLEANFILES +=						\
-	gnome-shell.desktop.in				\
-	gnome-shell-wayland.desktop.in			\
+	org.gnome.Shell.desktop.in			\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(keys_DATA)					\
diff --git a/data/gnome-shell-wayland.desktop.in.in b/data/gnome-shell-wayland.desktop.in.in
deleted file mode 100644
index 40ebc517b..000000000
--- a/data/gnome-shell-wayland.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell (wayland compositor)
-_Comment=Window management and application launching
-Exec=@bindir@/gnome-shell --wayland --display-server
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false
diff --git a/data/gnome-shell.desktop.in.in b/data/org.gnome.Shell.desktop.in.in
similarity index 91%
rename from data/gnome-shell.desktop.in.in
rename to data/org.gnome.Shell.desktop.in.in
index 058269e02..d3321b68e 100644
--- a/data/gnome-shell.desktop.in.in
+++ b/data/org.gnome.Shell.desktop.in.in
@@ -10,7 +10,7 @@ X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
-X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Autostart-Phase=DisplayServer
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
diff --git a/man/gnome-shell.xml b/man/gnome-shell.xml
index 90b194e1d..e93ea2b71 100644
--- a/man/gnome-shell.xml
+++ b/man/gnome-shell.xml
@@ -140,7 +140,7 @@
 
                 <para>
                         <filename>/usr/share/gnome-session/sessions/gnome.session</filename>,
-                        <filename>/usr/share/applications/gnome-shell.desktop</filename>.</para>
+                        <filename>/usr/share/applications/org.gnome.Shell.desktop</filename>.</para>
         </refsect1>
 
         <refsect1>