NetworkManager r4106 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Thu Sep 25 16:16:52 2008
New Revision: 4106
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4106&view=rev

Log:
2008-09-25  Dan Williams  <dcbw redhat com>

	* libnm-util/nm-setting-gsm.c
	  libnm-util/nm-setting-gsm.h
		- Fix up NM_GSM_NETWORK_* constants to accurately reflect the network
			technology terms (bgo #551361)



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-gsm.c
   trunk/libnm-util/nm-setting-gsm.h

Modified: trunk/libnm-util/nm-setting-gsm.c
==============================================================================
--- trunk/libnm-util/nm-setting-gsm.c	(original)
+++ trunk/libnm-util/nm-setting-gsm.c	Thu Sep 25 16:16:52 2008
@@ -338,7 +338,7 @@
 					    "Network type",
 					    "Network type",
 					    NM_GSM_NETWORK_ANY,
-					    NM_GSM_NETWORK_PREFER_GSM,
+					    NM_GSM_NETWORK_PREFER_UMTS_HSPA,
 					    NM_GSM_NETWORK_ANY,
 					    G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 

Modified: trunk/libnm-util/nm-setting-gsm.h
==============================================================================
--- trunk/libnm-util/nm-setting-gsm.h	(original)
+++ trunk/libnm-util/nm-setting-gsm.h	Thu Sep 25 16:16:52 2008
@@ -65,10 +65,10 @@
 
 enum {
 	NM_GSM_NETWORK_ANY = -1,
-	NM_GSM_NETWORK_GPRS = 0,
-	NM_GSM_NETWORK_GSM = 1,
-	NM_GSM_NETWORK_PREFER_GPRS = 2,
-	NM_GSM_NETWORK_PREFER_GSM = 3
+	NM_GSM_NETWORK_UMTS_HSPA = 0,
+	NM_GSM_NETWORK_GPRS_EDGE = 1,
+	NM_GSM_NETWORK_PREFER_UMTS_HSPA = 2,
+	NM_GSM_NETWORK_PREFER_GPRS_EDGE = 3
 };
 
 typedef struct {