Commit 1ea85945 authored by Dan Williams's avatar Dan Williams
Browse files

2005-05-05 Dan Williams <dcbw@redhat.com>

	* gnome/applet/main.c
		- Fix session management so the applet is actually managed now

	* gnome/applet/passphrase-dialog.c
		- (nmi_passphrase_dialog_show): bash focus-stealing prevention in the face


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@609 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 140114bb
2005-05-05 Dan Williams <dcbw@redhat.com>
* gnome/applet/main.c
- Fix session management so the applet is actually managed now
* gnome/applet/passphrase-dialog.c
- (nmi_passphrase_dialog_show): bash focus-stealing prevention in the face
2005-05-05 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss:
......
......@@ -245,6 +245,7 @@ static void vpn_login_failure_dialog_close_cb (GtkWidget *dialog, gpointer user_
static gboolean nmwa_show_vpn_login_failure_dialog (char *message)
{
GtkWidget *dialog;
guint32 timestamp;
g_return_val_if_fail (message != NULL, FALSE);
......@@ -254,6 +255,10 @@ static gboolean nmwa_show_vpn_login_failure_dialog (char *message)
g_object_set_data (G_OBJECT (dialog), "message", message);
gtk_widget_show_all (dialog);
/* Bash focus-stealing prevention in the face */
timestamp = gdk_x11_get_server_time (dialog->window);
gdk_x11_window_set_user_time (dialog->window, timestamp);
return FALSE;
}
......@@ -301,6 +306,7 @@ static void vpn_login_banner_dialog_close_cb (GtkWidget *dialog, gpointer user_d
static gboolean nmwa_show_vpn_login_banner_dialog (char *message)
{
GtkWidget *dialog;
guint32 timestamp;
g_return_val_if_fail (message != NULL, FALSE);
......@@ -310,6 +316,10 @@ static gboolean nmwa_show_vpn_login_banner_dialog (char *message)
g_object_set_data (G_OBJECT (dialog), "message", message);
gtk_widget_show_all (dialog);
/* Bash focus-stealing prevention in the face */
timestamp = gdk_x11_get_server_time (dialog->window);
gdk_x11_window_set_user_time (dialog->window, timestamp);
return FALSE;
}
......
......@@ -43,17 +43,13 @@ int main (int argc, char *argv[])
{
NMWirelessApplet * nmwa;
GnomeClient * client;
GPtrArray * restart_argv;
gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PARAM_NONE);
client = gnome_master_client ();
restart_argv = g_ptr_array_new ();
g_ptr_array_add (restart_argv, g_get_prgname ());
gnome_client_set_restart_command (client, restart_argv->len, (char**) restart_argv->pdata);
g_ptr_array_free (restart_argv, TRUE);
gnome_client_set_restart_command (client, argc, argv);
gnome_client_set_restart_style (client, GNOME_RESTART_IMMEDIATELY);
g_signal_connect (client, "save_yourself", G_CALLBACK (session_save), NULL);
......
......@@ -301,6 +301,7 @@ static gboolean nmi_passphrase_dialog_show (PPDialogCBData *cb_data)
GtkWidget * dialog;
GladeXML * dialog_xml;
const char * orig_label_text;
guint32 timestamp;
g_return_val_if_fail (cb_data != NULL, FALSE);
g_return_val_if_fail (cb_data->applet != NULL, FALSE);
......@@ -333,6 +334,10 @@ static gboolean nmi_passphrase_dialog_show (PPDialogCBData *cb_data)
gtk_widget_show (dialog);
/* Bash focus-stealing prevention in the face */
timestamp = gdk_x11_get_server_time (dialog->window);
gdk_x11_window_set_user_time (dialog->window, timestamp);
return FALSE;
}
......
......@@ -279,8 +279,10 @@ static NMDevice * nm_policy_auto_get_best_device (NMData *data, NMAccessPoint **
highest_priority_dev = NULL;
}
#if 0
nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (best_wired_dev) : "(null)",
best_wireless_dev ? nm_device_get_iface (best_wireless_dev) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" );
#endif
return highest_priority_dev;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment