Commit f31ba400 authored by Laurent Bigonville's avatar Laurent Bigonville Committed by Jasper St. Pierre

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

https://bugzilla.gnome.org/show_bug.cgi?id=710847
parent 9181419e
...@@ -42,8 +42,6 @@ gdm-session-glue.h ...@@ -42,8 +42,6 @@ gdm-session-glue.h
gdm-session-glue.c gdm-session-glue.c
gdm-session-worker-glue.h gdm-session-worker-glue.h
gdm-session-worker-glue.c gdm-session-worker-glue.c
gdm-simple-greeter.desktop.in
gdm-simple-greeter.schemas
gdm-simple-slave-glue.h gdm-simple-slave-glue.h
gdm-slave-glue.h gdm-slave-glue.h
gdm-slave-glue.c gdm-slave-glue.c
...@@ -110,7 +108,6 @@ daemon/gdm-session-enum-types.c ...@@ -110,7 +108,6 @@ daemon/gdm-session-enum-types.c
daemon/gdm-session-enum-types.h daemon/gdm-session-enum-types.h
data/gdm.schemas.in data/gdm.schemas.in
data/gdm-shell.session data/gdm-shell.session
data/applications/gdm-simple-greeter.desktop
data/applications/gnome-mag.desktop data/applications/gnome-mag.desktop
data/applications/gnome-shell.desktop data/applications/gnome-shell.desktop
data/applications/gok.desktop data/applications/gok.desktop
...@@ -125,22 +122,6 @@ libgdm/gdm-manager-glue.h ...@@ -125,22 +122,6 @@ libgdm/gdm-manager-glue.h
libgdm/gdm-manager-glue.c libgdm/gdm-manager-glue.c
gui/simple-chooser/gdm-host-chooser gui/simple-chooser/gdm-host-chooser
gui/simple-chooser/gdm-simple-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 install-sh
intltool-extract.in intltool-extract.in
intltool-merge.in intltool-merge.in
......
...@@ -1136,14 +1136,6 @@ AC_ARG_WITH(check-accelerated-directory, ...@@ -1136,14 +1136,6 @@ AC_ARG_WITH(check-accelerated-directory,
CHECK_ACCELERATED_DIR=$with_check_accelerated_directory CHECK_ACCELERATED_DIR=$with_check_accelerated_directory
AC_SUBST(CHECK_ACCELERATED_DIR) 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 ---------------------------------------------------------------------------
dnl - Check for XEvIE extension support dnl - Check for XEvIE extension support
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
...@@ -1433,15 +1425,6 @@ fi ...@@ -1433,15 +1425,6 @@ fi
AC_SUBST(GDM_SCREENSHOT_DIR) 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 ---------------------------------------------------------------------------
dnl - Finish dnl - Finish
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
...@@ -1621,7 +1604,6 @@ echo " ...@@ -1621,7 +1604,6 @@ echo "
consolekit location: ${with_consolekit_directory} consolekit location: ${with_consolekit_directory}
gnome-settings-daemon location: ${with_gnome_settings_daemon_directory} gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
gnome-session-check-accel location: ${with_check_accelerated_directory} gnome-session-check-accel location: ${with_check_accelerated_directory}
polkit-gnome location: ${with_authentication_agent_directory}
source code location: ${srcdir} source code location: ${srcdir}
compiler: ${CC} compiler: ${CC}
cflags: ${CFLAGS} cflags: ${CFLAGS}
......
...@@ -5,8 +5,7 @@ edit = sed \ ...@@ -5,8 +5,7 @@ edit = sed \
-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
-e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \
-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
-e 's,[@]AUTHENTICATION_AGENT_DIR[@],$(AUTHENTICATION_AGENT_DIR),g'
%.desktop.in: %.desktop.in.in Makefile %.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@ $(edit) $< >$@
...@@ -14,9 +13,7 @@ edit = sed \ ...@@ -14,9 +13,7 @@ edit = sed \
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
desktopdir = $(pkgdatadir)/greeter/applications desktopdir = $(pkgdatadir)/greeter/applications
desktop_in_files = \ desktop_in_files = \
gdm-simple-greeter.desktop.in \
gnome-shell.desktop.in \ gnome-shell.desktop.in \
polkit-gnome-authentication-agent-1.desktop.in \
$(NULL) $(NULL)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \
mime-dummy-handler.desktop \ mime-dummy-handler.desktop \
...@@ -24,16 +21,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \ ...@@ -24,16 +21,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) \
$(NULL) $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
gdm-simple-greeter.desktop.in.in \
polkit-gnome-authentication-agent-1.desktop.in.in \
$(desktop_in_files) \ $(desktop_in_files) \
$(desktop_DATA) \ $(desktop_DATA) \
$(NULL) $(NULL)
DISTCLEANFILES = \ DISTCLEANFILES = \
$(desktop_in_files:.desktop.in=.desktop) \ $(desktop_in_files:.desktop.in=.desktop) \
polkit-gnome-authentication-agent-1.desktop.in \
gdm-simple-greeter.desktop.in \
$(NULL) $(NULL)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
......
[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
[Desktop Entry]
Type=Application
_Name=PolicyKit Authentication Agent
Exec=@AUTHENTICATION_AGENT_DIR@/polkit-gnome-authentication-agent-1
OnlyShowIn=GNOME;
[GNOME Session]
Name=Display Manager
RequiredComponents=gdm-simple-greeter;gnome-settings-daemon;polkit-gnome-authentication-agent-1
RequiredProviders=windowmanager;
DefaultProvider-windowmanager=metacity
[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
...@@ -29,7 +29,6 @@ daemon/gdm-xdmcp-display-factory.c ...@@ -29,7 +29,6 @@ daemon/gdm-xdmcp-display-factory.c
daemon/main.c daemon/main.c
daemon/session-worker-main.c daemon/session-worker-main.c
daemon/test-session-client.c daemon/test-session-client.c
data/applications/gdm-simple-greeter.desktop.in.in
data/applications/gnome-shell.desktop.in data/applications/gnome-shell.desktop.in
data/gdm.schemas.in.in data/gdm.schemas.in.in
data/org.gnome.login-screen.gschema.xml.in data/org.gnome.login-screen.gschema.xml.in
......
...@@ -6,8 +6,4 @@ ...@@ -6,8 +6,4 @@
# Without these files, "make distcheck" fails. Please do not # Without these files, "make distcheck" fails. Please do not
# remove these unless you fix "make distcheck" a different way. # 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 data/gdm.schemas.in
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment