diff options
| author | Laurent Bigonville <bigon@bigon.be> | 2014-09-06 15:36:57 +0200 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-10-01 18:21:01 -0600 |
| commit | f31ba4003357e2732adf74fc2286415c85d975fe (patch) | |
| tree | 7e77ffcf952f4957dfeadd3b66ac0604dce0c9c4 /data | |
| parent | 9181419e471acbc0b3600eacd0c4513830a76ea3 (diff) | |
| download | gdm-f31ba4003357e2732adf74fc2286415c85d975fe.tar.gz | |
Remove files related to the simple-greeter and the fallback session
https://bugzilla.gnome.org/show_bug.cgi?id=710847
Diffstat (limited to 'data')
| -rw-r--r-- | data/applications/Makefile.am | 9 | ||||
| -rw-r--r-- | data/applications/gdm-simple-greeter.desktop.in.in | 9 | ||||
| -rw-r--r-- | data/applications/polkit-gnome-authentication-agent-1.desktop.in.in | 6 | ||||
| -rw-r--r-- | data/gdm-fallback.session | 5 | ||||
| -rw-r--r-- | data/gdm-shell-with-fallback.session.in | 5 |
5 files changed, 1 insertions, 33 deletions
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am index 2432d59f..2f68b5d8 100644 --- a/data/applications/Makefile.am +++ b/data/applications/Makefile.am @@ -5,8 +5,7 @@ edit = sed \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ - -e 's,[@]AUTHENTICATION_AGENT_DIR[@],$(AUTHENTICATION_AGENT_DIR),g' + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' %.desktop.in: %.desktop.in.in Makefile $(edit) $< >$@ @@ -14,9 +13,7 @@ edit = sed \ @INTLTOOL_DESKTOP_RULE@ desktopdir = $(pkgdatadir)/greeter/applications desktop_in_files = \ - gdm-simple-greeter.desktop.in \ gnome-shell.desktop.in \ - polkit-gnome-authentication-agent-1.desktop.in \ $(NULL) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \ mime-dummy-handler.desktop \ @@ -24,16 +21,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \ $(NULL) EXTRA_DIST = \ - gdm-simple-greeter.desktop.in.in \ - polkit-gnome-authentication-agent-1.desktop.in.in \ $(desktop_in_files) \ $(desktop_DATA) \ $(NULL) DISTCLEANFILES = \ $(desktop_in_files:.desktop.in=.desktop) \ - polkit-gnome-authentication-agent-1.desktop.in \ - gdm-simple-greeter.desktop.in \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/data/applications/gdm-simple-greeter.desktop.in.in b/data/applications/gdm-simple-greeter.desktop.in.in deleted file mode 100644 index e6b1dbfd..00000000 --- a/data/applications/gdm-simple-greeter.desktop.in.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -_Name=Login Window -Exec=@LIBEXECDIR@/gdm-simple-greeter -OnlyShowIn=GNOME; -X-GNOME-Autostart-Phase=Application -X-GNOME-Autostart-Notify=true -X-GNOME-AutoRestart=true -NoDisplay=true diff --git a/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in b/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in deleted file mode 100644 index b00317da..00000000 --- a/data/applications/polkit-gnome-authentication-agent-1.desktop.in.in +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -_Name=PolicyKit Authentication Agent -Exec=@AUTHENTICATION_AGENT_DIR@/polkit-gnome-authentication-agent-1 -OnlyShowIn=GNOME; - diff --git a/data/gdm-fallback.session b/data/gdm-fallback.session deleted file mode 100644 index 137bd877..00000000 --- a/data/gdm-fallback.session +++ /dev/null @@ -1,5 +0,0 @@ -[GNOME Session] -Name=Display Manager -RequiredComponents=gdm-simple-greeter;gnome-settings-daemon;polkit-gnome-authentication-agent-1 -RequiredProviders=windowmanager; -DefaultProvider-windowmanager=metacity diff --git a/data/gdm-shell-with-fallback.session.in b/data/gdm-shell-with-fallback.session.in deleted file mode 100644 index 1bea43c7..00000000 --- a/data/gdm-shell-with-fallback.session.in +++ /dev/null @@ -1,5 +0,0 @@ -[GNOME Session] -Name=Display Manager -RequiredComponents=gnome-shell;gnome-settings-daemon; -IsRunnableHelper=bash -c 'type -p gnome-shell >& /dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated' -FallbackSession=gdm-fallback |