2006-02-28 Dan Williams <dcbw@redhat.com>

* gnome/applet/applet.c
		- (nma_menu_add_vpn_menu): until the NM VPN manager can deal with
			overlapping connection requests, disable all VPN menu items
			but the active VPN connection


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1529 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-03-01 03:24:09 +00:00
parent 911b3a9193
commit 15a6f01743
2 changed files with 19 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2006-02-28 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet.c
- (nma_menu_add_vpn_menu): until the NM VPN manager can deal with
overlapping connection requests, disable all VPN menu items
but the active VPN connection
2006-02-28 Dan Williams <dcbw@redhat.com>
* src/vpn-manager/nm-vpn-connection.c

View file

@ -1690,8 +1690,18 @@ static void nma_menu_add_vpn_menu (GtkWidget *menu, NMApplet *applet)
nma_vpn_connection_ref (vpn);
g_object_set_data (G_OBJECT (vpn_item), "vpn", vpn);
if (active_vpn && active_vpn == vpn)
gtk_check_menu_item_set_active (vpn_item, TRUE);
/* FIXME: all VPN items except the active one are disabled,
* due to a bug in the VPN handling code in NM. See commit to
* src/vpn-manager/nm-vpn-service.c on 2006-02-28 by dcbw for
* more details.
*/
if (active_vpn)
{
if (active_vpn == vpn)
gtk_check_menu_item_set_active (vpn_item, TRUE);
else
gtk_widget_set_sensitive (GTK_WIDGET (vpn_item), FALSE);
}
if (applet->nm_state != NM_STATE_CONNECTED)
gtk_widget_set_sensitive (GTK_WIDGET (vpn_item), FALSE);