network-manager-applet r827 - in trunk: . src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Wed Aug  6 23:24:26 2008
New Revision: 827
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=827&view=rev

Log:
2008-08-06  Dan Williams  <dcbw redhat com>

	* src/connection-editor/page-ip4.c
		- 'shared' is pointless for VPN connections



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/page-ip4.c

Modified: trunk/src/connection-editor/page-ip4.c
==============================================================================
--- trunk/src/connection-editor/page-ip4.c	(original)
+++ trunk/src/connection-editor/page-ip4.c	Wed Aug  6 23:24:26 2008
@@ -76,7 +76,7 @@
 #define METHOD_COL_NUM  1
 
 #define IP4_METHOD_AUTO            0
-#define IP4_METHOD_AUTO_MANUAL_DNS 1
+#define IP4_METHOD_AUTO_ADDRESSES  1
 #define IP4_METHOD_MANUAL          2
 #define IP4_METHOD_LINK_LOCAL      3
 #define IP4_METHOD_SHARED          4
@@ -106,8 +106,8 @@
 
 	gtk_list_store_append (priv->method_store, &iter);
 	gtk_list_store_set (priv->method_store, &iter,
-	                    METHOD_COL_NAME, _("Automatic addressing only"),
-	                    METHOD_COL_NUM, IP4_METHOD_AUTO_MANUAL_DNS,
+	                    METHOD_COL_NAME, _("Automatic addresses only"),
+	                    METHOD_COL_NUM, IP4_METHOD_AUTO_ADDRESSES,
 	                    -1);
 
 	gtk_list_store_append (priv->method_store, &iter);
@@ -123,13 +123,13 @@
 		                    METHOD_COL_NAME, _("Link-Local Only"),
 		                    METHOD_COL_NUM, IP4_METHOD_LINK_LOCAL,
 		                    -1);
-	}
 
-	gtk_list_store_append (priv->method_store, &iter);
-	gtk_list_store_set (priv->method_store, &iter,
-	                    METHOD_COL_NAME, _("Shared to other computers"),
-	                    METHOD_COL_NUM, IP4_METHOD_SHARED,
-	                    -1);
+		gtk_list_store_append (priv->method_store, &iter);
+		gtk_list_store_set (priv->method_store, &iter,
+		                    METHOD_COL_NAME, _("Shared to other computers"),
+		                    METHOD_COL_NUM, IP4_METHOD_SHARED,
+		                    -1);
+	}
 
 	gtk_combo_box_set_model (priv->method, GTK_TREE_MODEL (priv->method_store));
 
@@ -170,7 +170,7 @@
 	case IP4_METHOD_AUTO:
 		dhcp_enabled = routes_enabled = TRUE;
 		break;
-	case IP4_METHOD_AUTO_MANUAL_DNS:
+	case IP4_METHOD_AUTO_ADDRESSES:
 		addr_enabled = FALSE;
 		dns_enabled = dhcp_enabled = routes_enabled = TRUE;
 		break;
@@ -255,7 +255,7 @@
 	}
 
 	if (method == IP4_METHOD_AUTO && setting->ignore_auto_dns)
-		method = IP4_METHOD_AUTO_MANUAL_DNS;
+		method = IP4_METHOD_AUTO_ADDRESSES;
 
 	info.method = method;
 	info.combo = priv->method;
@@ -324,7 +324,7 @@
 	gtk_entry_set_text (priv->dns_searches, string->str);
 	g_string_free (string, TRUE);
 
-	if ((method == IP4_METHOD_AUTO) || (method = IP4_METHOD_AUTO_MANUAL_DNS)) {
+	if ((method == IP4_METHOD_AUTO) || (method = IP4_METHOD_AUTO_ADDRESSES)) {
 		if (setting->dhcp_client_id)
 			gtk_entry_set_text (priv->dhcp_client_id, setting->dhcp_client_id);
 	}
@@ -690,7 +690,7 @@
 	case IP4_METHOD_SHARED:
 		method = NM_SETTING_IP4_CONFIG_METHOD_SHARED;
 		break;
-	case IP4_METHOD_AUTO_MANUAL_DNS:
+	case IP4_METHOD_AUTO_ADDRESSES:
 		ignore_auto_dns = TRUE;
 		/* fall through */
 	default: