GNOME.org
 

[gdm] gui: drop fallback greeter

commit 8dbec8431d558b9d33adc987de2f7a58815589d4
Author: Ray Strode <rstrode redhat com>
Date:   Thu May 23 10:23:53 2013 -0400

    gui: drop fallback greeter
    
    We don't use it anymore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=688665

 configure.ac                                       |   31 -
 data/Makefile.am                                   |   13 +-
 docs/C/index.docbook                               |    4 +-
 gui/Makefile.am                                    |    2 -
 gui/simple-greeter/Makefile.am                     |  258 --
 gui/simple-greeter/extensions/Makefile.am          |    5 -
 .../extensions/fingerprint/Makefile.am             |   46 -
 .../fingerprint/gdm-fingerprint-extension.c        |  464 ----
 .../fingerprint/gdm-fingerprint-extension.h        |   56 -
 .../extensions/fingerprint/icons/16x16/Makefile.am |    5 -
 .../fingerprint/icons/16x16/gdm-fingerprint.png    |  Bin 461 -> 0 bytes
 .../extensions/fingerprint/icons/48x48/Makefile.am |    5 -
 .../fingerprint/icons/48x48/gdm-fingerprint.png    |  Bin 1638 -> 0 bytes
 .../extensions/fingerprint/icons/Makefile.am       |    1 -
 gui/simple-greeter/extensions/fingerprint/page.ui  |   57 -
 gui/simple-greeter/extensions/password/Makefile.am |   43 -
 .../extensions/password/gdm-password-extension.c   |  446 ---
 .../extensions/password/gdm-password-extension.h   |   56 -
 gui/simple-greeter/extensions/password/page.ui     |   57 -
 .../extensions/smartcard/Makefile.am               |   66 -
 .../extensions/smartcard/gdm-smartcard             |   18 -
 .../extensions/smartcard/gdm-smartcard-extension.c |  604 -----
 .../extensions/smartcard/gdm-smartcard-extension.h |   56 -
 .../extensions/smartcard/gdm-smartcard-manager.c   | 1445 ----------
 .../extensions/smartcard/gdm-smartcard-manager.h   |   86 -
 .../extensions/smartcard/gdm-smartcard-worker.c    |  184 --
 .../extensions/smartcard/gdm-smartcard.c           |  552 ----
 .../extensions/smartcard/gdm-smartcard.h           |   94 -
 .../extensions/smartcard/icons/16x16/Makefile.am   |    5 -
 .../smartcard/icons/16x16/gdm-smartcard.png        |  Bin 871 -> 0 bytes
 .../extensions/smartcard/icons/48x48/Makefile.am   |    5 -
 .../smartcard/icons/48x48/gdm-smartcard.png        |  Bin 4202 -> 0 bytes
 .../extensions/smartcard/icons/Makefile.am         |    1 -
 gui/simple-greeter/extensions/smartcard/page.ui    |   57 -
 gui/simple-greeter/extensions/unified/Makefile.am  |   42 -
 .../extensions/unified/gdm-unified-extension.c     |  441 ---
 .../extensions/unified/gdm-unified-extension.h     |   57 -
 gui/simple-greeter/extensions/unified/gdm.pam      |   12 -
 gui/simple-greeter/extensions/unified/page.ui      |   57 -
 gui/simple-greeter/gdm-cell-renderer-timer.c       |  259 --
 gui/simple-greeter/gdm-cell-renderer-timer.h       |   57 -
 gui/simple-greeter/gdm-chooser-widget.c            | 2849 --------------------
 gui/simple-greeter/gdm-chooser-widget.h            |  151 --
 gui/simple-greeter/gdm-clock-widget.c              |  314 ---
 gui/simple-greeter/gdm-clock-widget.h              |   56 -
 gui/simple-greeter/gdm-extension-list.c            |  388 ---
 gui/simple-greeter/gdm-extension-list.h            |   70 -
 gui/simple-greeter/gdm-greeter-login-window.c      | 2623 ------------------
 gui/simple-greeter/gdm-greeter-login-window.h      |  106 -
 gui/simple-greeter/gdm-greeter-login-window.ui     |  284 --
 gui/simple-greeter/gdm-greeter-panel.c             | 1207 ---------
 gui/simple-greeter/gdm-greeter-panel.h             |   72 -
 gui/simple-greeter/gdm-greeter-session.c           |  698 -----
 gui/simple-greeter/gdm-greeter-session.h           |   58 -
 gui/simple-greeter/gdm-option-widget.c             | 1144 --------
 gui/simple-greeter/gdm-option-widget.h             |   87 -
 gui/simple-greeter/gdm-remote-login-window.c       |  314 ---
 gui/simple-greeter/gdm-remote-login-window.h       |   61 -
 gui/simple-greeter/gdm-scrollable-widget.c         |  909 -------
 gui/simple-greeter/gdm-scrollable-widget.h         |   74 -
 gui/simple-greeter/gdm-session-option-widget.c     |  192 --
 gui/simple-greeter/gdm-session-option-widget.h     |   62 -
 gui/simple-greeter/gdm-sessions.c                  |  265 --
 gui/simple-greeter/gdm-sessions.h                  |   38 -
 gui/simple-greeter/gdm-timer.c                     |  327 ---
 gui/simple-greeter/gdm-timer.h                     |   62 -
 gui/simple-greeter/gdm-user-chooser-dialog.c       |  199 --
 gui/simple-greeter/gdm-user-chooser-dialog.h       |   62 -
 gui/simple-greeter/gdm-user-chooser-widget.c       | 1366 ----------
 gui/simple-greeter/gdm-user-chooser-widget.h       |   70 -
 gui/simple-greeter/gdm-user-private.h              |   49 -
 gui/simple-greeter/greeter-main.c                  |  284 --
 gui/simple-greeter/libgdmsimplegreeter/Makefile.am |   43 -
 .../libgdmsimplegreeter/gdm-login-extension.c      |  277 --
 .../libgdmsimplegreeter/gdm-login-extension.h      |  128 -
 .../libgdmsimplegreeter/gdmsimplegreeter.pc.in     |   11 -
 .../org.gnome.SessionManager.ClientPrivate.xml     |  123 -
 gui/simple-greeter/org.gnome.SessionManager.xml    |  392 ---
 gui/simple-greeter/test-a11y-preferences.c         |   56 -
 gui/simple-greeter/test-filesystem-type.c          |  107 -
 gui/simple-greeter/test-greeter-background.c       |   54 -
 gui/simple-greeter/test-greeter-login-window.c     |  121 -
 gui/simple-greeter/test-greeter-panel.c            |   63 -
 gui/simple-greeter/test-languages.c                |   81 -
 gui/simple-greeter/test-remote-login-window.c      |  100 -
 gui/simple-greeter/test-sessions.c                 |   81 -
 gui/simple-greeter/test-user-chooser.c             |   69 -
 gui/simple-greeter/test-user-manager.c             |  148 -
 88 files changed, 5 insertions(+), 21937 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 14d5f5e..02bddea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,16 +150,6 @@ fi
 AC_SUBST(LIBSELINUX_CFLAGS)
 AC_SUBST(LIBSELINUX_LIBS)
 
-PKG_CHECK_MODULES(SIMPLE_GREETER,
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-       fontconfig >= $FONTCONFIG_REQUIRED_VERSION
-        accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION
-       x11
-)
-SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm"
-AC_SUBST(SIMPLE_GREETER_CFLAGS)
-AC_SUBST(SIMPLE_GREETER_LIBS)
-
 PKG_CHECK_MODULES(SIMPLE_CHOOSER,
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
 )
@@ -291,11 +281,6 @@ AC_ARG_WITH(plymouth,
             AS_HELP_STRING([--with-plymouth],
                            [Add plymouth support @<:@default=auto@:>@]),
             [with_plymouth=$withval], [with_plymouth=auto])
-AC_ARG_ENABLE(fallback-greeter,
-             AS_HELP_STRING([--enable-fallback-greeter],
-                             [Enable fallback greeter @<:@default=no@:>@]),,
-              enable_fallback_greeter=no)
-AM_CONDITIONAL(ENABLE_FALLBACK_GREETER, test x$enable_fallback_greeter = xyes)
 
 AC_ARG_WITH(at-spi-registryd-directory,
             AS_HELP_STRING([--with-at-spi-registryd-directory],
@@ -368,7 +353,6 @@ EXTRA_FLEXI_LIBS=""
 EXTRA_DYNAMIC_LIBS=""
 EXTRA_SETUP_LIBS=""
 EXTRA_TEST_LIBS=""
-EXTRA_GREETER_LIBS=""
 
 AC_CHECK_FUNC(socket,,[
              AC_CHECK_LIB(socket,socket, [
@@ -1231,7 +1215,6 @@ AC_SUBST(EXTRA_FLEXI_LIBS)
 AC_SUBST(EXTRA_DYNAMIC_LIBS)
 AC_SUBST(EXTRA_SETUP_LIBS)
 AC_SUBST(EXTRA_TEST_LIBS)
-AC_SUBST(EXTRA_GREETER_LIBS)
 
 # Check for Solaris logindevperm support
 #
@@ -1591,20 +1574,6 @@ docs/Makefile
 gui/Makefile
 gui/libgdm/Makefile
 gui/libgdm/gdm.pc
-gui/simple-greeter/Makefile
-gui/simple-greeter/libgdmsimplegreeter/Makefile
-gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc
-gui/simple-greeter/extensions/Makefile
-gui/simple-greeter/extensions/unified/Makefile
-gui/simple-greeter/extensions/password/Makefile
-gui/simple-greeter/extensions/fingerprint/Makefile
-gui/simple-greeter/extensions/fingerprint/icons/Makefile
-gui/simple-greeter/extensions/fingerprint/icons/16x16/Makefile
-gui/simple-greeter/extensions/fingerprint/icons/48x48/Makefile
-gui/simple-greeter/extensions/smartcard/Makefile
-gui/simple-greeter/extensions/smartcard/icons/Makefile
-gui/simple-greeter/extensions/smartcard/icons/16x16/Makefile
-gui/simple-greeter/extensions/smartcard/icons/48x48/Makefile
 gui/simple-chooser/Makefile
 utils/Makefile
 data/gdm.conf
diff --git a/data/Makefile.am b/data/Makefile.am
index 3d7bf3b..81eb8ef 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -80,15 +80,9 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
                -e 's,[ ]sbindir[@],$(sbindir),g' \
                <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
 
-if ENABLE_FALLBACK_GREETER
-FALLBACK_SESSION_IN = $(srcdir)/gdm-shell-with-fallback.session.in
-else
-FALLBACK_SESSION_IN = $(srcdir)/gdm-shell.session.in
-endif
-
-EXTRA_DIST += gdm-shell.session.in gdm-shell-with-fallback.session.in
+EXTRA_DIST += gdm-shell.session.in
 
-gdm-shell.session: $(FALLBACK_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 $@
@@ -97,7 +91,7 @@ localealiasdir = $(datadir)/gdm
 localealias_DATA = locale.alias
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_DATA = gdm-fallback.session gdm-shell.session
+session_DATA =  gdm-shell.session
 
 pam_redhat_files = pam-redhat/gdm.pam          \
        pam-redhat/gdm-autologin.pam            \
@@ -156,7 +150,6 @@ EXTRA_DIST +=                       \
        gdm.schemas.in.in       \
        gdm.conf-custom.in      \
        Xsession.in             \
-       gdm-fallback.session    \
        Init.in                 \
        PreSession.in           \
        PostSession.in          \
diff --git a/docs/C/index.docbook b/docs/C/index.docbook
index 1def3b4..fe6976e 100644
--- a/docs/C/index.docbook
+++ b/docs/C/index.docbook
@@ -116,7 +116,7 @@
     </para>
 
     <para>
-      Greeter - The graphical login window (<command>gdm-simple-greeter</command>).
+      Greeter - The graphical login window (provided by <command>gnome-shell</command>).
     </para>
 
     <para>
@@ -385,7 +385,7 @@
       <para>
         The Face Browser is the interface which allows users to select their
         username by clicking on an image.  This feature can be enabled or
-        disabled via the /apps/gdm/simple-greeter/disable_user_list GConf
+        disabled via the org.gnome.login-screen disable-user-list GSettings 
         key and is on by default.  When disabled, users must type their
         complete username by hand.  When enabled, it displays all local users
         which are available for login on the system (all user accounts defined
diff --git a/gui/Makefile.am b/gui/Makefile.am
index ce90055..04da105 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 SUBDIRS =                      \
        libgdm                  \
-       simple-greeter          \
        $(NULL)
 
 if XDMCP_SUPPORT
@@ -12,5 +11,4 @@ endif
 DIST_SUBDIRS =                 \
        libgdm                  \
        simple-chooser          \
-       simple-greeter          \
        $(NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]