[network-manager-applet/rm-userset] editor: remove usage of deprecated (and now removed) types



commit 202ab9421c596e74b745b58ba3a29d1c6ecd3130
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 27 18:53:39 2011 -0600

    editor: remove usage of deprecated (and now removed) types

 src/connection-editor/page-mobile.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 9605619..efebdb0 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -116,19 +116,19 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
 		gtk_entry_set_text (priv->network_id, s);
 
 	switch (nm_setting_gsm_get_network_type (setting)) {
-	case NM_GSM_NETWORK_UMTS_HSPA:
+	case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA:
 		type_idx = NET_TYPE_3G;
 		break;
-	case NM_GSM_NETWORK_GPRS_EDGE:
+	case NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE:
 		type_idx = NET_TYPE_2G;
 		break;
-	case NM_GSM_NETWORK_PREFER_UMTS_HSPA:
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA:
 		type_idx = NET_TYPE_PREFER_3G;
 		break;
-	case NM_GSM_NETWORK_PREFER_GPRS_EDGE:
+	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE:
 		type_idx = NET_TYPE_PREFER_2G;
 		break;
-	case NM_GSM_NETWORK_ANY:
+	case NM_SETTING_GSM_NETWORK_TYPE_ANY:
 	default:
 		type_idx = NET_TYPE_ANY;
 		break;
@@ -411,20 +411,20 @@ gsm_ui_to_setting (CEPageMobile *self)
 
 	switch (gtk_combo_box_get_active (priv->network_type)) {
 	case NET_TYPE_3G:
-		net_type = NM_GSM_NETWORK_UMTS_HSPA;
+		net_type = NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA;
 		break;
 	case NET_TYPE_2G:
-		net_type = NM_GSM_NETWORK_GPRS_EDGE;
+		net_type = NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE;
 		break;
 	case NET_TYPE_PREFER_3G:
-		net_type = NM_GSM_NETWORK_PREFER_UMTS_HSPA;
+		net_type = NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA;
 		break;
 	case NET_TYPE_PREFER_2G:
-		net_type = NM_GSM_NETWORK_PREFER_GPRS_EDGE;
+		net_type = NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE;
 		break;
 	case NET_TYPE_ANY:
 	default:
-		net_type = NM_GSM_NETWORK_ANY;
+		net_type = NM_SETTING_GSM_NETWORK_TYPE_ANY;
 		break;
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]