fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 16:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* panel-applet/NMWirelessApplet.c
		- Display name of wireless network we are connecting to or connected to
			in the tooltip of the applet


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@406 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-02-02 21:22:40 +00:00
parent c1dea88b98
commit 5f2c23beff
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-02-02 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessApplet.c
- Display name of wireless network we are connecting to or connected to
in the tooltip of the applet
2005-02-02 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDHCP.c

14
panel-applet/NMWirelessApplet.c
View file

@ -271,9 +271,11 @@ nmwa_update_state (NMWirelessApplet *applet)
GdkPixbuf *pixbuf = NULL;
gint strength = -1;
char *tip = NULL;
WirelessNetwork *active_network = NULL;
g_mutex_lock (applet->data_mutex);
if (applet->active_device)
if ( applet->active_device
&& (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET))
{
GSList *list;
for (list = applet->active_device->networks; list; list = list->next)
@ -281,9 +283,13 @@ nmwa_update_state (NMWirelessApplet *applet)
WirelessNetwork *network = (WirelessNetwork *) list->data;
if (network->active)
{
strength = CLAMP ((int) network->strength, 0, 100);
active_network = network;
}
}
/* Fall back to old strength if current strength is invalid */
if (strength <= 0)
strength = applet->active_device->strength;
}
@ -337,7 +343,8 @@ nmwa_update_state (NMWirelessApplet *applet)
pixbuf = applet->wireless_25_icon;
else
pixbuf = applet->wireless_00_icon;
tip = g_strdup_printf (_("Wireless network connection (%d%%)"), strength);
tip = g_strdup_printf (_("Wireless network connection to '%s' (%d%%)"),
active_network ? active_network->essid : "(unknown)", strength);
}
}
else
@ -346,7 +353,8 @@ nmwa_update_state (NMWirelessApplet *applet)
case (APPLET_STATE_WIRELESS_CONNECTING):
need_animation = TRUE;
tip = g_strdup (_("Connecting to a wireless network..."));
tip = g_strdup_printf (_("Connecting to wireless network '%s'..."),
active_network ? active_network->essid : "(unknown)");
break;
case (APPLET_STATE_NO_NM):