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

[dcbw svn gnome org]

Author: dcbw
Date: Thu Sep 25 16:17:54 2008
New Revision: 906
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=906&view=rev

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

	* src/connection-editor/ce-page-mobile.glade
	  src/connection-editor/page-mobile.c
		- Fix names & constants to accurately reflect the network technologies
			in question (bgo #551361)



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

Modified: trunk/src/connection-editor/ce-page-mobile.glade
==============================================================================
--- trunk/src/connection-editor/ce-page-mobile.glade	(original)
+++ trunk/src/connection-editor/ce-page-mobile.glade	Thu Sep 25 16:17:54 2008
@@ -419,10 +419,10 @@
 		    <widget class="GtkComboBox" id="mobile_network_type">
 		      <property name="visible">True</property>
 		      <property name="items" translatable="yes">Any
-GPRS
-GSM
-Prefer GPRS
-Prefer GSM</property>
+3G (UMTS/HSPA)
+2G (GPRS/EDGE)
+Prefer 3G (UMTS/HSPA)
+Prefer 2G (GPRS/EDGE)</property>
 		      <property name="add_tearoffs">False</property>
 		      <property name="focus_on_click">True</property>
 		    </widget>

Modified: trunk/src/connection-editor/page-mobile.c
==============================================================================
--- trunk/src/connection-editor/page-mobile.c	(original)
+++ trunk/src/connection-editor/page-mobile.c	Thu Sep 25 16:17:54 2008
@@ -57,10 +57,10 @@
 } CEPageMobilePrivate;
 
 #define NET_TYPE_ANY         0
-#define NET_TYPE_GPRS        1
-#define NET_TYPE_GSM         2
-#define NET_TYPE_PREFER_GPRS 3
-#define NET_TYPE_PREFER_GSM  4
+#define NET_TYPE_3G          1
+#define NET_TYPE_2G          2
+#define NET_TYPE_PREFER_3G   3
+#define NET_TYPE_PREFER_2G   4
 
 static void
 mobile_private_init (CEPageMobile *self)
@@ -121,17 +121,17 @@
 		gtk_entry_set_text (priv->network_id, setting->network_id);
 
 	switch (setting->network_type) {
-	case NM_GSM_NETWORK_GPRS:
-		type_idx = NET_TYPE_GPRS;
+	case NM_GSM_NETWORK_UMTS_HSPA:
+		type_idx = NET_TYPE_3G;
 		break;
-	case NM_GSM_NETWORK_GSM:
-		type_idx = NET_TYPE_GSM;
+	case NM_GSM_NETWORK_GPRS_EDGE:
+		type_idx = NET_TYPE_2G;
 		break;
-	case NM_GSM_NETWORK_PREFER_GPRS:
-		type_idx = NET_TYPE_PREFER_GPRS;
+	case NM_GSM_NETWORK_PREFER_UMTS_HSPA:
+		type_idx = NET_TYPE_PREFER_3G;
 		break;
-	case NM_GSM_NETWORK_PREFER_GSM:
-		type_idx = NET_TYPE_PREFER_GSM;
+	case NM_GSM_NETWORK_PREFER_GPRS_EDGE:
+		type_idx = NET_TYPE_PREFER_2G;
 		break;
 	case NM_GSM_NETWORK_ANY:
 	default:
@@ -313,17 +313,17 @@
 	int net_type;
 
 	switch (gtk_combo_box_get_active (priv->network_type)) {
-	case NET_TYPE_GPRS:
-		net_type = NM_GSM_NETWORK_GPRS;
+	case NET_TYPE_3G:
+		net_type = NM_GSM_NETWORK_UMTS_HSPA;
 		break;
-	case NET_TYPE_GSM:
-		net_type = NM_GSM_NETWORK_GSM;
+	case NET_TYPE_2G:
+		net_type = NM_GSM_NETWORK_GPRS_EDGE;
 		break;
-	case NET_TYPE_PREFER_GPRS:
-		net_type = NM_GSM_NETWORK_PREFER_GPRS;
+	case NET_TYPE_PREFER_3G:
+		net_type = NM_GSM_NETWORK_PREFER_UMTS_HSPA;
 		break;
-	case NET_TYPE_PREFER_GSM:
-		net_type = NM_GSM_NETWORK_PREFER_GSM;
+	case NET_TYPE_PREFER_2G:
+		net_type = NM_GSM_NETWORK_PREFER_GPRS_EDGE;
 		break;
 	case NET_TYPE_ANY:
 	default: