network-manager-applet r470 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jan 23 14:08:45 2008
New Revision: 470
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=470&view=rev

Log:
2008-01-23  Dan Williams  <dcbw redhat com>

	* src/applet-dialogs.c
	  src/applet-device-wireless.c
		- (applet_warning_dialog_show, other_wireless_activate_cb,
		   new_network_activate_cb): get the right behavior when faced with
			metacticy's focus stealing prevention; we really do want the key
			dialog to come up on top.  The issue is somewhat mitigated by the
			fact that any input won't really leak.



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-wireless.c
   trunk/src/applet-dialogs.c

Modified: trunk/src/applet-device-wireless.c
==============================================================================
--- trunk/src/applet-device-wireless.c	(original)
+++ trunk/src/applet-device-wireless.c	Wed Jan 23 14:08:45 2008
@@ -71,7 +71,7 @@
 
 	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));
 }
 
@@ -110,7 +110,7 @@
 
 	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));
 }
 

Modified: trunk/src/applet-dialogs.c
==============================================================================
--- trunk/src/applet-dialogs.c	(original)
+++ trunk/src/applet-dialogs.c	Wed Jan 23 14:08:45 2008
@@ -331,7 +331,7 @@
 	/* 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",