diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-02-17 11:56:36 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-02-17 23:48:08 -0500 |
| commit | a7f4c586cf5490f4e4833e3d2ede178239a6b4fa (patch) | |
| tree | 874b06816f8f573a4b3b1d447bea412a5b85612d | |
| parent | ca882203daaaf442c1d0cb84027805312d7e9055 (diff) | |
| download | gdm-a7f4c586cf5490f4e4833e3d2ede178239a6b4fa.tar.gz | |
data: drop gdm-shell.session
It's identical to gnome.session these days. All GDMification comes
from the overriden gnome-shell.desktop file.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 11 | ||||
| -rw-r--r-- | data/dconf/defaults/00-upstream-settings | 3 | ||||
| -rw-r--r-- | data/gdm-shell.session.in | 3 |
4 files changed, 0 insertions, 18 deletions
@@ -107,7 +107,6 @@ daemon/test-external-greeter daemon/gdm-session-enum-types.c daemon/gdm-session-enum-types.h data/gdm.schemas.in -data/gdm-shell.session data/applications/gnome-mag.desktop data/applications/gnome-shell.desktop data/applications/gok.desktop diff --git a/data/Makefile.am b/data/Makefile.am index b2a18e70..cb59954f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -91,19 +91,9 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in -EXTRA_DIST += gdm-shell.session.in - -gdm-shell.session: $(srcdir)/gdm-shell.session.in - sed -e 's,[@]libexecdir[@],$(libexecdir),g' \ - -e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \ - < $< > $@.tmp && mv $@.tmp $@ - localealiasdir = $(datadir)/gdm localealias_DATA = locale.alias -sessiondir = $(datadir)/gnome-session/sessions -session_DATA = gdm-shell.session - pam_redhat_files = pam-redhat/gdm.pam \ pam-redhat/gdm-autologin.pam \ pam-redhat/gdm-launch-environment.pam \ @@ -181,7 +171,6 @@ CLEANFILES = \ DISTCLEANFILES = \ $(dbusconf_DATA) \ - gdm-shell.session \ gdm.schemas \ $(NULL) diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings index 24a7715e..fa81c262 100644 --- a/data/dconf/defaults/00-upstream-settings +++ b/data/dconf/defaults/00-upstream-settings @@ -28,9 +28,6 @@ disable-print-setup=true disable-save-to-disk=true disable-user-switching=true -[org/gnome/desktop/session] -session-name='gdm-shell' - [org/gnome/desktop/sound] event-sounds=true diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in deleted file mode 100644 index 585c45da..00000000 --- a/data/gdm-shell.session.in +++ /dev/null @@ -1,3 +0,0 @@ -[GNOME Session] -Name=Display Manager -RequiredComponents=gnome-shell;gnome-settings-daemon; |