[gdm/wip/wayland-at-login-screen: 61/70] data: drop gdm-shell.session



commit a7f4c586cf5490f4e4833e3d2ede178239a6b4fa
Author: Ray Strode <rstrode redhat com>
Date:   Tue Feb 17 11:56:36 2015 -0500

    data: drop gdm-shell.session
    
    It's identical to gnome.session these days.  All GDMification comes
    from the overriden gnome-shell.desktop file.

 .gitignore                               |    1 -
 data/Makefile.am                         |   11 -----------
 data/dconf/defaults/00-upstream-settings |    3 ---
 data/gdm-shell.session.in                |    3 ---
 4 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f05a2f..0454763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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 b2a18e7..cb59954 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 24a7715..fa81c26 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
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]