gnome-screensaver r1481 - in trunk: . src

[mccann svn gnome org]

Author: mccann
Date: Fri Aug 15 14:38:10 2008
New Revision: 1481
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1481&view=rev

Log:
2008-08-15  William Jon McCann  <jmccann redhat com>

	* configure.ac: Remove some obsolete gdm stuff.

	* src/debug-screensaver.sh: Use just debug

	* src/gnome-screensaver-dialog.c (auth_check_idle):
	Add some debug spew.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/debug-screensaver.sh
   trunk/src/gnome-screensaver-dialog.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 15 14:38:10 2008
@@ -171,54 +171,6 @@
 AC_SUBST(LIB_GNOME_MENU_CFLAGS)
 AC_SUBST(LIB_GNOME_MENU_LIBS)
 
-# GDM Config File
-
-GDMCONFIGFILE=
-
-AC_ARG_WITH([gdm_config],
-	    AC_HELP_STRING([--with-gdm-config=file],
-			   [The location of the GDM configuration file]),
-	    [gdmconfigfile="$withval"])
-
-if test "x$gdmconfigfile" = "x" -o "x$gdmconfigfile" = "xyes"; then
-	AC_MSG_CHECKING([for GDM configuration file])
-
-	if test -f "/etc/gdm/gdm.conf"; then
-		gdmconfigfile="/etc/gdm/gdm.conf"
-	elif test -f "/etc/X11/gdm/gdm.conf"; then
-		gdmconfigfile="/etc/X11/gdm/gdm.conf"
-	elif test -f "/etc/opt/gnome/gdm/gdm.conf"; then
-		gdmconfigfile="/etc/opt/gnome/gdm/gdm.conf"
-        elif test -f "/etc/gdm/custom.conf"; then
-                gdmconfigfile="/etc/gdm/custom.conf"
-        elif test -f "/etc/X11/gdm/custom.conf"; then
-                gdmconfigfile="/etc/X11/gdm/custom.conf"
-        elif test -f "/etc/gdm/gdm.conf-custom"; then
-                gdmconfigfile="/etc/gdm/gdm.conf-custom"
-        elif test -f "/etc/X11/gdm/gdm.conf-custom"; then
-                gdmconfigfile="/etc/X11/gdm/gdm.conf-custom"
-	else
-		gdmconfigfile=""
-	fi
-
-	AC_MSG_RESULT([$gdmconfigfile])
-elif test "x$gdmconfigfile" = "xno"; then
-        gdmconfigfile=""
-else
-	AC_MSG_RESULT([using "$gdmconfigfile" as the GDM configuration file location])
-fi
-
-AC_DEFINE_UNQUOTED(GDMCONFIGFILE, "$gdmconfigfile", [The location of the GDM configuration file])
-
-enable_user_switching=no
-if test "x$gdmconfigfile" != "x" -a "x$gdmconfigfile" != "xno"; then
-	enable_user_switching=yes
-	AC_DEFINE(HAVE_USER_SWITCHING, 1, [Define if user switching is available])
-fi
-
-AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
-AC_SUBST(HAVE_USER_SWITCHING)
-
 dnl ---------------------------------------------------------------------------
 dnl - Where should we put documentation ?
 dnl ---------------------------------------------------------------------------

Modified: trunk/src/debug-screensaver.sh
==============================================================================
--- trunk/src/debug-screensaver.sh	(original)
+++ trunk/src/debug-screensaver.sh	Fri Aug 15 14:38:10 2008
@@ -33,10 +33,10 @@
 gnome-screensaver-command --exit
 
 # run the daemon in the debugger
-gdb --args gnome-screensaver --no-daemon --debug --sync
+#gdb --args gnome-screensaver --no-daemon --debug --sync
 
 # or if that isn't helpful just get the debug output
 #gnome-screensaver --no-daemon --debug > /tmp/gs-debug-log.txt 2>&1
 
 # or just run it with debugging on
-#gnome-screensaver --no-daemon --debug
+gnome-screensaver --no-daemon --debug

Modified: trunk/src/gnome-screensaver-dialog.c
==============================================================================
--- trunk/src/gnome-screensaver-dialog.c	(original)
+++ trunk/src/gnome-screensaver-dialog.c	Fri Aug 15 14:38:10 2008
@@ -339,8 +339,10 @@
                 loop_counter++;
 
                 if (loop_counter < MAX_FAILURES) {
+                        gs_debug ("Authentication failed, retrying (%u)", loop_counter);
                         g_timeout_add (3000, (GSourceFunc)reset_idle_cb, plug);
                 } else {
+                        gs_debug ("Authentication failed, quitting (max failures)");
                         again = FALSE;
                         gtk_main_quit ();
                 }