Remove files related to the simple-greeter and the fallback session

https://bugzilla.gnome.org/show_bug.cgi?id=710847

9 files changed, 1 insertions, 75 deletions

diff --git a/.gitignore b/.gitignore
index e66e03f9..90040446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,8 +42,6 @@ gdm-session-glue.h
 gdm-session-glue.c
 gdm-session-worker-glue.h
 gdm-session-worker-glue.c
-gdm-simple-greeter.desktop.in
-gdm-simple-greeter.schemas
 gdm-simple-slave-glue.h
 gdm-slave-glue.h
 gdm-slave-glue.c
@@ -110,7 +108,6 @@ daemon/gdm-session-enum-types.c
 daemon/gdm-session-enum-types.h
 data/gdm.schemas.in
 data/gdm-shell.session
-data/applications/gdm-simple-greeter.desktop
 data/applications/gnome-mag.desktop
 data/applications/gnome-shell.desktop
 data/applications/gok.desktop
@@ -125,22 +122,6 @@ libgdm/gdm-manager-glue.h
 libgdm/gdm-manager-glue.c
 gui/simple-chooser/gdm-host-chooser
 gui/simple-chooser/gdm-simple-chooser
-gui/simple-greeter/gdm-simple-greeter
-gui/simple-greeter/gsm-client-glue.c
-gui/simple-greeter/gsm-client-glue.h
-gui/simple-greeter/gsm-manager-glue.c
-gui/simple-greeter/gsm-manager-glue.h
-gui/simple-greeter/test-filesystem-type
-gui/simple-greeter/test-greeter-login-window
-gui/simple-greeter/test-greeter-panel
-gui/simple-greeter/test-language-chooser
-gui/simple-greeter/test-languages
-gui/simple-greeter/test-layout-chooser
-gui/simple-greeter/test-remote-login-window
-gui/simple-greeter/test-sessions
-gui/simple-greeter/test-user-chooser
-gui/simple-greeter/test-user-manager
-gui/user-switch-applet/gdm-user-switch-applet
 install-sh
 intltool-extract.in
 intltool-merge.in
diff --git a/configure.ac b/configure.ac
index 9cac4dec..c844cf1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,14 +1136,6 @@ AC_ARG_WITH(check-accelerated-directory,
 CHECK_ACCELERATED_DIR=$with_check_accelerated_directory
 AC_SUBST(CHECK_ACCELERATED_DIR)
 
-AC_ARG_WITH(authentication-agent-directory,
-              [AC_HELP_STRING([--with-authentication-agent-directory],
-                              [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],,
-                              [with_authentication_agent_directory="\${libexecdir}"])
-
-AUTHENTICATION_AGENT_DIR=$with_authentication_agent_directory
-AC_SUBST(AUTHENTICATION_AGENT_DIR)
-
 dnl ---------------------------------------------------------------------------
 dnl - Check for XEvIE extension support
 dnl ---------------------------------------------------------------------------
@@ -1434,15 +1426,6 @@ fi
 AC_SUBST(GDM_SCREENSHOT_DIR)
 
 dnl ---------------------------------------------------------------------------
-dnl - Directory for simple greeter extensions
-dnl ---------------------------------------------------------------------------
-GDM_SIMPLE_GREETER_PLUGINS_DIR=${libdir}/gdm/simple-greeter/extensions
-AC_SUBST(GDM_SIMPLE_GREETER_PLUGINS_DIR)
-
-GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR=${datadir}/gdm/simple-greeter/extensions
-AC_SUBST(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)
-
-dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 
@@ -1621,7 +1604,6 @@ echo "
 	consolekit location:      ${with_consolekit_directory}
 	gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
 	gnome-session-check-accel location: ${with_check_accelerated_directory}
-	polkit-gnome location:    ${with_authentication_agent_directory}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 	cflags:		          ${CFLAGS}
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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27b47358..e0ac0852 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,7 +29,6 @@ daemon/gdm-xdmcp-display-factory.c
 daemon/main.c
 daemon/session-worker-main.c
 daemon/test-session-client.c
-data/applications/gdm-simple-greeter.desktop.in.in
 data/applications/gnome-shell.desktop.in
 data/gdm.schemas.in.in
 data/org.gnome.login-screen.gschema.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5faa4e55..8b7f3902 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,8 +6,4 @@
 # Without these files, "make distcheck" fails.  Please do not
 # remove these unless you fix "make distcheck" a different way.
 #
-data/applications/gdm-simple-greeter.desktop.in
-data/applications/polkit-gnome-authentication-agent-1.desktop.in
-data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
 data/gdm.schemas.in
-