fix bad color string

Fri Jan 02 16:31:34 2004  George Lebl <jirka@5z.com>

	* config/PreSession.in: fix bad color string

	* config/gdm.conf.in: add full path to the default list of modules
	  comment

	* daemon/verify-pam.c: don't use the pam_fail_delay but rather the
	  fallback only.  The fail delay will block at bad times when we
	  don't want it too.

	* gui/gdmsetup.c: save the config after flicking the accessibility
	  modules setting and set default path on the sounds thing
	  to /usr/share/sounds, even though it doesn't work because the
	  stupid GnomeFileEntry is broken!  Will file a bug/fix it later.

5 files changed, 34 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 207fdfe4..9031d39f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Fri Jan 02 16:31:34 2004  George Lebl <jirka@5z.com>
+
+	* config/PreSession.in: fix bad color string
+
+	* config/gdm.conf.in: add full path to the default list of modules
+	  comment
+
+	* daemon/verify-pam.c: don't use the pam_fail_delay but rather the
+	  fallback only.  The fail delay will block at bad times when we
+	  don't want it too.
+
+	* gui/gdmsetup.c: save the config after flicking the accessibility
+	  modules setting and set default path on the sounds thing
+	  to /usr/share/sounds, even though it doesn't work because the
+	  stupid GnomeFileEntry is broken!  Will file a bug/fix it later.
+
 2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
 
         * configure.in: Added "hr" in ALL_LINGUAS.
diff --git a/config/PreSession.in b/config/PreSession.in
index 662c7f3e..5dfbeb60 100755
--- a/config/PreSession.in
+++ b/config/PreSession.in
@@ -13,7 +13,7 @@ if [ "x$XSETROOT" != "x" ] ; then
 	# Try to snarf the BackgroundColor from the config file
 	BACKCOLOR=`grep '^BackgroundColor' @EXPANDED_SYSCONFDIR@/gdm/gdm.conf | sed 's/^.*=\(.*\)$/\1/'`
 	if [ "x$BACKCOLOR" = "x" ]; then
-		BACKCOLOR="#76848"
+		BACKCOLOR="#76848F"
 	fi
 	"$XSETROOT" -cursor_name left_ptr -solid "$BACKCOLOR"
 fi
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 36cb79a1..5db613f8 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -53,7 +53,7 @@ TimedLoginDelay=30
 # be allowed to minimise security holes
 #AddGtkModules=false
 # By default these are the accessibility modules
-#GtkModulesList=gail:atk-bridge:dwellmouselistener:keymouselistener
+#GtkModulesList=gail:atk-bridge:@EXPANDED_LIBDIR@/gtk-2.0/modules/libdwellmouselistener:@EXPANDED_LIBDIR@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this
 #DefaultPath=/bin:/usr/bin:@X_CONF_PATH@:@EXPANDED_BINDIR@
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index ae272a1c..ecde2e2f 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -504,9 +504,14 @@ authenticate_again:
 
     pam_set_item (pamh, PAM_USER_PROMPT, _("Username:"));
 
+#if 0
+    /* FIXME: this makes things wait at the wrong places! such as
+       when running the configurator.  We wish to ourselves cancel logins
+       without a delay, so ... evil */
 #ifdef PAM_FAIL_DELAY
     pam_fail_delay (pamh, GdmRetryDelay * 1000000);
 #endif /* PAM_FAIL_DELAY */
+#endif
 
     did_we_ask_for_password = FALSE;
 
@@ -544,9 +549,12 @@ authenticate_again:
 	    if (started_timer)
 		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
 	    if (gdm_slave_should_complain ()) {
-#ifndef PAM_FAIL_DELAY
+		    /* FIXME: see note above about PAM_FAIL_DELAY */
+/* #ifndef PAM_FAIL_DELAY */
 		    gdm_sleep_no_signal (GdmRetryDelay);
-#endif /* PAM_FAIL_DELAY */
+		    /* wait up to 100ms randomly */
+		    usleep (g_random_int_range (0, 100000));
+/* #endif */ /* PAM_FAIL_DELAY */
 		    gdm_error (_("Couldn't authenticate user"));
 	    }
 	    goto pamerr;
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 633592ac..a263ff55 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -1129,6 +1129,8 @@ acc_modules_toggled (GtkWidget *toggle, gpointer data)
 			    GDM_KEY_ADD_GTK_MODULES,
 			    add_gtk_modules);
 
+	ve_config_save (ve_config_get (GDM_CONFIG_FILE), FALSE /*force */);
+
 	g_free (modules_list);
 
 	update_key (GDM_KEY_GTK_MODULES_LIST);
@@ -1141,6 +1143,7 @@ setup_accessibility_support (void)
 	GtkWidget *acc_modules = glade_helper_get (xml, "acc_modules", GTK_TYPE_TOGGLE_BUTTON);
 	GtkWidget *acc_sound_test = glade_helper_get (xml, "acc_sound_test", GTK_TYPE_BUTTON);
 	GtkWidget *acc_sound_file_entry = glade_helper_get (xml, "acc_sound_file_entry", GTK_TYPE_ENTRY);
+	GtkWidget *acc_sound_file = glade_helper_get (xml, "acc_sound_file", GNOME_TYPE_FILE_ENTRY);
 
 	gboolean add_gtk_modules = ve_config_get_bool (ve_config_get (GDM_CONFIG_FILE),
 						       GDM_KEY_ADD_GTK_MODULES);
@@ -1165,6 +1168,9 @@ setup_accessibility_support (void)
 	g_signal_connect (G_OBJECT (acc_sound_test), "clicked",
 			  G_CALLBACK (test_sound),
 			  acc_sound_file_entry);
+
+	if (access ("/usr/share/sounds", F_OK) == 0)
+		gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (acc_sound_file), "/usr/share/sounds/");
 }
 
 static void