summaryrefslogtreecommitdiff
path: root/data/applications
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-11-09 10:57:16 -0500
committerRay Strode <rstrode@redhat.com>2015-11-09 13:05:06 -0500
commit26006da375bc38afb270296e927d71180f6bed01 (patch)
tree578d18fdba23e3c5ff8777a5dcc6eb249b7c0b7a /data/applications
parentac1b142ae0054a9350e6115642a3642abee2c232 (diff)
downloadgdm-26006da375bc38afb270296e927d71180f6bed01.tar.gz
data: drop override xsession files
We now tell gnome-shell to use GDM mode a different way so we don't need to override the desktop files anymore. https://bugzilla.gnome.org/show_bug.cgi?id=757715
Diffstat (limited to 'data/applications')
-rw-r--r--data/applications/Makefile.am9
-rw-r--r--data/applications/gnome-shell-wayland.desktop.in8
-rw-r--r--data/applications/gnome-shell.desktop.in7
3 files changed, 1 insertions, 23 deletions
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index c458d820..e1213ca1 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -12,22 +12,15 @@ edit = sed \
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(pkgdatadir)/greeter/applications
-desktop_in_files = \
- gnome-shell.desktop.in \
- gnome-shell-wayland.desktop.in \
- $(NULL)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \
- mime-dummy-handler.desktop \
+desktop_DATA = mime-dummy-handler.desktop \
mimeapps.list \
$(NULL)
EXTRA_DIST = \
- $(desktop_in_files) \
$(desktop_DATA) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_in_files:.desktop.in=.desktop) \
$(NULL)
MAINTAINERCLEANFILES = \
diff --git a/data/applications/gnome-shell-wayland.desktop.in b/data/applications/gnome-shell-wayland.desktop.in
deleted file mode 100644
index 179bbd1b..00000000
--- a/data/applications/gnome-shell-wayland.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell
-_Comment=Window management and compositing
-Exec=gnome-shell --mode=gdm --wayland --display-server
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
diff --git a/data/applications/gnome-shell.desktop.in b/data/applications/gnome-shell.desktop.in
deleted file mode 100644
index 467a050a..00000000
--- a/data/applications/gnome-shell.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell
-_Comment=Window management and compositing
-Exec=gnome-shell --mode=gdm
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true