diff -upr gdm-2.16.1-pre/gui/gdmsetup.c gdm-2.16.1-post/gui/gdmsetup.c
--- gdm-2.16.1-pre/gui/gdmsetup.c	2006-09-27 17:02:46.000000000 -0500
+++ gdm-2.16.1-post/gui/gdmsetup.c	2006-11-07 18:27:08.000000000 -0600
@@ -60,6 +60,8 @@ static gboolean  GdmAllowRoot;
 static gboolean  GdmAllowRemoteRoot;
 static gboolean  GdmUserChangesUnsaved;
 
+#define LONG_TIMEOUT G_MAXINT
+
 /* set the DOING_GDM_DEVELOPMENT env variable if you want to
  * search for the glade file in the current dir and not the system
  * install dir, better then something you have to change
@@ -1069,7 +1071,7 @@ combobox_timeout (GtkWidget *combo_box)
 static void
 toggle_toggled (GtkWidget *toggle)
 {
-	run_timeout (toggle, 200, toggle_timeout);
+	run_timeout (toggle, LONG_TIMEOUT, toggle_timeout);
 }
 
 static void
@@ -1097,13 +1099,13 @@ list_selection_toggled (GtkWidget *toggl
 		gtk_widget_set_sensitive (widget, FALSE);
 	}
 
-	run_timeout (toggle, 200, toggle_timeout);
+	run_timeout (toggle, LONG_TIMEOUT, toggle_timeout);
 }
 
 static void
 intspin_changed (GtkWidget *spin)
 {
-	run_timeout (spin, 500, intspin_timeout);
+	run_timeout (spin, LONG_TIMEOUT, intspin_timeout);
 }
 
 static void
@@ -1668,6 +1670,9 @@ setup_intspin (const char *name,
 	g_object_set_data_full (G_OBJECT (spin),
 				"key", g_strdup (key),
 				(GDestroyNotify) g_free);
+	g_object_set_data_full (G_OBJECT (toggle),
+				"notify_key", g_strdup (key),
+				(GDestroyNotify) g_free);
 
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), val);
 
@@ -2252,7 +2257,7 @@ greeter_toggle_timeout (GtkWidget *toggl
 static void
 greeter_toggle_toggled (GtkWidget *toggle)
 {
-	run_timeout (toggle, 500, greeter_toggle_timeout);
+	run_timeout (toggle, LONG_TIMEOUT, greeter_toggle_timeout);
 }
 
 static void
@@ -2595,7 +2600,7 @@ greeter_entry_untranslate_timeout (GtkWi
 static void
 greeter_entry_untranslate_changed (GtkWidget *entry)
 {
-	run_timeout (entry, 500, greeter_entry_untranslate_timeout);
+	run_timeout (entry, LONG_TIMEOUT, greeter_entry_untranslate_timeout);
 }
 
 static void