diff -up NetworkManager-0.6.4/gnome/applet/other-network-dialog.c.focus-stealing NetworkManager-0.6.4/gnome/applet/other-network-dialog.c
--- NetworkManager-0.6.4/gnome/applet/other-network-dialog.c.focus-stealing	2008-01-08 15:57:37.000000000 -0500
+++ NetworkManager-0.6.4/gnome/applet/other-network-dialog.c	2008-01-08 15:59:04.000000000 -0500
@@ -459,7 +459,7 @@ void nma_other_network_dialog_run (NMApp
 	g_signal_connect (dialog, "response", G_CALLBACK (nma_ond_response_cb), NULL);
 
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_window_present (GTK_WINDOW (dialog));
 }
diff -up NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c.focus-stealing NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c
--- NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c.focus-stealing	2008-01-08 15:56:45.000000000 -0500
+++ NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c	2008-01-08 15:59:04.000000000 -0500
@@ -267,8 +267,8 @@ nmi_passphrase_dialog_new (NMApplet *app
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_window_present (GTK_WINDOW (dialog));
 
 	return dialog;
diff -up NetworkManager-0.6.4/gnome/applet/applet.c.focus-stealing NetworkManager-0.6.4/gnome/applet/applet.c
--- NetworkManager-0.6.4/gnome/applet/applet.c.focus-stealing	2008-01-08 15:56:04.000000000 -0500
+++ NetworkManager-0.6.4/gnome/applet/applet.c	2008-01-08 15:59:04.000000000 -0500
@@ -394,8 +394,7 @@ nma_show_vpn_failure_dialog (const char 
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_widget_show_all (dialog);
 }
 #endif
@@ -488,8 +487,7 @@ nma_show_vpn_login_banner_dialog (const 
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_widget_show_all (dialog);
 }
 #endif
@@ -768,8 +766,7 @@ gboolean nma_driver_notify (gpointer use
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_widget_show_all (dialog);
 
 out:
@@ -1195,8 +1192,7 @@ static gboolean show_warning_dialog (cha
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_widget_realize (dialog);
-	gdk_x11_window_set_user_time (dialog->window, gtk_get_current_event_time ());
+	gdk_x11_window_set_user_time (dialog->window, gdk_x11_get_server_time (dialog->window));
 	gtk_window_present (GTK_WINDOW (dialog));
 
 	g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);