fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-23 13:10:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-04-10 Robert Love <rml@novell.com>

Browse source 
* gnome/vpn-properties/nm-vpn-properties.c: Intercept and short-circuit
	  the "delete_event" signal on the druid's parent window and handle it
	  our way, lest using the WM to close the druid results in a series of
	  bloody and ultimately lethal errors.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1677 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-04-10 18:45:46 +00:00 • committed by Robert Love
parent 6685c4cf31
commit aa93d507ad
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-10 Robert Love <rml@novell.com>
* gnome/vpn-properties/nm-vpn-properties.c: Intercept and short-circuit
the "delete_event" signal on the druid's parent window and handle it
our way, lest using the WM to close the druid results in a series of
bloody and ultimately lethal errors.
2006-04-10 Robert Love <rml@novell.com>
* gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on

20
gnome/vpn-properties/nm-vpn-properties.c
View file

@ -353,7 +353,11 @@ static gboolean vpn_druid_cancel (GnomeDruid *ignored_druid, gpointer user_data)
return FALSE;
}
static gboolean vpn_window_close (GtkWidget *ignored, gpointer user_data)
{
gtk_widget_hide_all (GTK_WIDGET (druid_window));
return TRUE;
}
static void
add_cb (GtkButton *button, gpointer user_data)
@ -623,7 +627,7 @@ edit_cb (GtkButton *button, gpointer user_data)
char *conn_gconf_path;
GtkTreeIter iter;
/*printf ("edit\n");*/
printf ("edit_cb\n");
if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
goto out;
@ -785,7 +789,7 @@ export_cb (GtkButton *button, gpointer user_data)
const char *conn_name;
char *conn_gconf_path;
/*printf ("edit\n");*/
/*printf ("export_cb\n");*/
if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
goto out;
@ -919,6 +923,7 @@ init_app (void)
GtkCellRenderer *renderer;
GSList *i;
GtkHBox *vpn_type_hbox1;
GtkWidget *toplevel;
GDir *dir;
/* TODO: ensure only one copy of this program is running at any time */
@ -990,10 +995,8 @@ init_app (void)
vpn_delete = glade_xml_get_widget (xml, "delete");
gtk_signal_connect (GTK_OBJECT (vpn_delete), "clicked", GTK_SIGNAL_FUNC (delete_cb), NULL);
w = glade_xml_get_widget (xml, "close");
gtk_signal_connect (GTK_OBJECT (w), "clicked",
GTK_SIGNAL_FUNC (close_cb), NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
GTK_SIGNAL_FUNC (close_cb), NULL);
gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (close_cb), NULL);
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", GTK_SIGNAL_FUNC (close_cb), NULL);
vpn_conn_view = GTK_TREE_VIEW (glade_xml_get_widget (xml, "vpnlist"));
vpn_conn_list = gtk_list_store_new (VPNCONN_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
@ -1040,6 +1043,9 @@ init_app (void)
gtk_signal_connect_after (GTK_OBJECT (w), "prepare", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_prepare), NULL);
gtk_signal_connect_after (GTK_OBJECT (w), "finish", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_finish), NULL);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection"));
/* make the druid window modal wrt. our main window */