From dbd1e23f13edcca7a2a62ec5e1b4f5703eb3fa12 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 25 Sep 2008 16:16:52 +0000 Subject: [PATCH] 2008-09-25 Dan Williams * 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) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4106 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ libnm-util/nm-setting-gsm.c | 2 +- libnm-util/nm-setting-gsm.h | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfc8e10fb9..ec67637a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-09-25 Dan Williams + + * 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) + 2008-09-25 Dan Williams Fix bgo #549401 (inspired by patch from Alexander Sack) diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index b65fa65a22..68c836b206 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -338,7 +338,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "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)); diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h index 4305aaa788..58a1a63d4e 100644 --- a/libnm-util/nm-setting-gsm.h +++ b/libnm-util/nm-setting-gsm.h @@ -65,10 +65,10 @@ GQuark nm_setting_gsm_error_quark (void); 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 {