Author: dcbw
Date: Tue Jan  8 21:23:19 2008
New Revision: 436
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=436&view=rev

Log:
2008-01-08  Dan Williams  <[EMAIL PROTECTED]>

        * src/applet.c
          src/other-network-dialog.c
          src/passphrase-dialog.c
                - (nma_show_vpn_failure_dialog, 
nma_show_vpn_login_banner_dialog,
                   nma_driver_notify, show_warning_dialog, 
nma_other_network_dialog_run,
                   nmi_passphrase_dialog_new): 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:
   branches/network-manager-applet-0-6/ChangeLog
   branches/network-manager-applet-0-6/src/applet.c
   branches/network-manager-applet-0-6/src/other-network-dialog.c
   branches/network-manager-applet-0-6/src/passphrase-dialog.c

Modified: branches/network-manager-applet-0-6/src/applet.c
==============================================================================
--- branches/network-manager-applet-0-6/src/applet.c    (original)
+++ branches/network-manager-applet-0-6/src/applet.c    Tue Jan  8 21:23:19 2008
@@ -397,8 +397,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_widget_show_all (dialog);
 }
 #endif
@@ -491,8 +490,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_widget_show_all (dialog);
 }
 #endif
@@ -771,8 +769,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_widget_show_all (dialog);
 
 out:
@@ -1198,8 +1195,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", G_CALLBACK 
(gtk_widget_destroy), dialog);

Modified: branches/network-manager-applet-0-6/src/other-network-dialog.c
==============================================================================
--- branches/network-manager-applet-0-6/src/other-network-dialog.c      
(original)
+++ branches/network-manager-applet-0-6/src/other-network-dialog.c      Tue Jan 
 8 21:23:19 2008
@@ -459,7 +459,6 @@
        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));
 }

Modified: branches/network-manager-applet-0-6/src/passphrase-dialog.c
==============================================================================
--- branches/network-manager-applet-0-6/src/passphrase-dialog.c (original)
+++ branches/network-manager-applet-0-6/src/passphrase-dialog.c Tue Jan  8 
21:23:19 2008
@@ -271,8 +271,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));
 
        return dialog;
_______________________________________________
SVN-commits-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Reply via email to