network-manager-applet r823 - in branches/mbca/src: . connection-editor

[kaijanma svn gnome org]

Author: kaijanma
Date: Wed Aug  6 13:01:33 2008
New Revision: 823
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=823&view=rev

Log:
keep up with trunk

Modified:
   branches/mbca/src/applet-device-gsm.c
   branches/mbca/src/connection-editor/nm-connection-list.c

Modified: branches/mbca/src/applet-device-gsm.c
==============================================================================
--- branches/mbca/src/applet-device-gsm.c	(original)
+++ branches/mbca/src/applet-device-gsm.c	Wed Aug  6 13:01:33 2008
@@ -114,7 +114,7 @@
 			s_serial->stopbits = 1;
 			nm_connection_add_setting (connection, NM_SETTING (s_serial));
 			
-			method = NM_SETTING_IP4_CONFIG_METHOD_DHCP;
+			method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
 			
 			s_gsm = NM_SETTING_GSM (nm_setting_gsm_new ());
 			s_gsm->number = g_strdup ("*99***1#");

Modified: branches/mbca/src/connection-editor/nm-connection-list.c
==============================================================================
--- branches/mbca/src/connection-editor/nm-connection-list.c	(original)
+++ branches/mbca/src/connection-editor/nm-connection-list.c	Wed Aug  6 13:01:33 2008
@@ -777,7 +777,7 @@
 
 		add_default_serial_setting (connection);
 
-		method = NM_SETTING_IP4_CONFIG_METHOD_DHCP;
+		method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
 
 		if (conf->provider->type == MBCA_NETWORK_GSM) {
 			NMSettingGsm *s_gsm;