fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 18:40:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-08-16 Robert Love <rml@novell.com>

Browse source 
* gnome/applet/applet.c: Better "Dial Up" menu item.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@854 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-08-16 20:09:58 +00:00 • committed by Robert Love
parent 74804ef194
commit c33a982574
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2005-08-16 Robert Love <rml@novell.com>
* gnome/applet/applet.c: Better "Dial Up" menu item.
2005-08-16 Robert Love <rml@novell.com> 2005-08-16 Robert Love <rml@novell.com>
* gnome/applet/applet.c: use GTK_STOCK_INFO not PROPERTIES for the * gnome/applet/applet.c: use GTK_STOCK_INFO not PROPERTIES for the

19
gnome/applet/applet.c
View file

@ -1740,7 +1740,7 @@ static void nmwa_menu_add_dialup_menu (GtkWidget *menu, NMWirelessApplet *applet
g_return_if_fail (menu != NULL); g_return_if_fail (menu != NULL);
g_return_if_fail (applet != NULL); g_return_if_fail (applet != NULL);
item = GTK_MENU_ITEM (gtk_menu_item_new_with_label (_("Dial Up"))); item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Dial Up Connections")));
dialup_menu = GTK_MENU (gtk_menu_new ()); dialup_menu = GTK_MENU (gtk_menu_new ());
for (elt = applet->dialup_list; elt; elt = g_slist_next (elt)) for (elt = applet->dialup_list; elt; elt = g_slist_next (elt))
@ -1793,6 +1793,7 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
GSList *element; GSList *element;
gint n_wireless_interfaces = 0; gint n_wireless_interfaces = 0;
gint n_wired_interfaces = 0; gint n_wired_interfaces = 0;
gboolean vpn_available, dialup_available;
g_return_if_fail (menu != NULL); g_return_if_fail (menu != NULL);
g_return_if_fail (applet != NULL); g_return_if_fail (applet != NULL);
@ -1855,16 +1856,16 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
} }
} }
if (is_vpn_available ()) /* Add the VPN and Dial Up menus and their associated seperator */
vpn_available = is_vpn_available ();
dialup_available = !! applet->dialup_list;
if (vpn_available || dialup_available)
{ {
nmwa_menu_add_separator_item (menu); nmwa_menu_add_separator_item (menu);
nmwa_menu_add_vpn_menu (menu, applet); if (vpn_available)
} nmwa_menu_add_vpn_menu (menu, applet);
if (dialup_available)
if (applet->dialup_list) nmwa_menu_add_dialup_menu (menu, applet);
{
nmwa_menu_add_separator_item (menu);
nmwa_menu_add_dialup_menu (menu, applet);
} }
if (n_wireless_interfaces > 0) if (n_wireless_interfaces > 0)