network-manager-applet r452 - in branches/network-manager-applet-0-6: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jan 17 18:30:42 2008
New Revision: 452
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=452&view=rev

Log:
2008-01-17  Dan Williams  <dcbw redhat com>

	* src/applet.c
		- (nma_update_state): add note about autoip address to tooltip when
			connected to wired connections with autoip



Modified:
   branches/network-manager-applet-0-6/ChangeLog
   branches/network-manager-applet-0-6/src/applet.c

Modified: branches/network-manager-applet-0-6/src/applet.c
==============================================================================
--- branches/network-manager-applet-0-6/src/applet.c	(original)
+++ branches/network-manager-applet-0-6/src/applet.c	Thu Jan 17 18:30:42 2008
@@ -1096,10 +1096,14 @@
 			break;
 
 		case NM_STATE_CONNECTED:
-			if (network_device_is_wired (act_dev))
-				tip = g_strdup (_("Wired network connection"));
-			else if (network_device_is_wireless (act_dev))
-			{
+			if (network_device_is_wired (act_dev)) {
+				const char *str_addr = network_device_get_ip4_address (act_dev);
+
+				if (str_addr && !strncmp (str_addr, LL_ADDR_PREFIX, strlen (LL_ADDR_PREFIX)))
+					tip = g_strdup (_("Wired network connection with a self-assigned address"));
+				else
+					tip = g_strdup (_("Wired network connection"));
+			} else if (network_device_is_wireless (act_dev)) {
 				if (applet->is_adhoc)
 					tip = g_strdup (_("Connected to an Ad-Hoc wireless network"));
 				else