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

[dcbw svn gnome org]

Author: dcbw
Date: Mon Jul 21 04:37:12 2008
New Revision: 795
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=795&view=rev

Log:
2008-07-21  Dan Williams  <dcbw redhat com>

	* src/connection-editor/ce-page-ip4.glade
	  src/connection-editor/page-ip4.c
		- DHCP -> Automatic; so that it's appropriate to use with VPNs too



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

Modified: trunk/src/connection-editor/ce-page-ip4.glade
==============================================================================
--- trunk/src/connection-editor/ce-page-ip4.glade	(original)
+++ trunk/src/connection-editor/ce-page-ip4.glade	Mon Jul 21 04:37:12 2008
@@ -26,10 +26,10 @@
             <child>
               <widget class="GtkComboBox" id="ip4_method">
                 <property name="visible">True</property>
-                <property name="items" translatable="yes">DHCP
-Auto IP
+                <property name="items" translatable="yes">Automatic
+Automatic with manual DNS settings
 Manual
-DHCP with manual DNS settings
+Link-Local
 Shared to other computers</property>
               </widget>
               <packing>

Modified: trunk/src/connection-editor/page-ip4.c
==============================================================================
--- trunk/src/connection-editor/page-ip4.c	(original)
+++ trunk/src/connection-editor/page-ip4.c	Mon Jul 21 04:37:12 2008
@@ -63,9 +63,9 @@
 } CEPageIP4Private;
 
 #define IP4_METHOD_DHCP            0
-#define IP4_METHOD_AUTOIP          1
+#define IP4_METHOD_DHCP_MANUAL_DNS 1
 #define IP4_METHOD_MANUAL          2
-#define IP4_METHOD_DHCP_MANUAL_DNS 3
+#define IP4_METHOD_AUTOIP          3
 #define IP4_METHOD_SHARED          4
 
 #define COL_ADDRESS 0