[network-manager-applet/aleksander/mm1-applet: 7/13] applet: ignore EV-DO revision internally

[Aleksander Morgado <aleksm src gnome org>]

commit 7383bb3e98d248a685324a3286c5bf0545c20c2a
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Dec 17 13:50:06 2012 +0100

    applet: ignore EV-DO revision internally
    
    Internal handling of the 3GPP2 access technologies tries to make a difference
    between the different revisions of EV-DO with different enum values, but:
     * Not all revisions are considered (EV-DO rev.B is not handled)
     * The EV-DO revision is never retrieved from ModemManager, always rev.A is
       assumed.
     * The UI treats all revisions in the same way (just as 'EVDO'), fully ignoring
       the revision.
    
    It just seems better to fully ignore the EV-DO revision internally, given the
    current situation.

 src/applet-device-cdma.c |    2 +-
 src/mb-menu-item.c       |    3 +--
 src/mobile-helpers.c     |    3 +--
 src/mobile-helpers.h     |    3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index ce675a1..b765774 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -218,7 +218,7 @@ static guint32
 cdma_act_to_mb_act (CdmaDeviceInfo *info)
 {
 	if (info->evdo_state)
-		return MB_TECH_EVDO_REVA; /* Always rA until we get CDMA AcT from MM */
+		return MB_TECH_EVDO;
 	else if (info->cdma1x_state)
 		return MB_TECH_1XRTT;
 	return MB_TECH_UNKNOWN;
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 5f945eb..7a5fb7f 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -52,8 +52,7 @@ get_tech_name (guint32 tech)
 	switch (tech) {
 	case MB_TECH_1XRTT:
 		return _("CDMA");
-	case MB_TECH_EVDO_REV0:
-	case MB_TECH_EVDO_REVA:
+	case MB_TECH_EVDO:
 		return _("EVDO");
 	case MB_TECH_GSM:
 		return _("GSM");
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 9459002..a07bedd 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -109,8 +109,7 @@ mobile_helper_get_tech_icon (guint32 tech, NMApplet *applet)
 	switch (tech) {
 	case MB_TECH_1XRTT:
 		return nma_icon_check_and_load ("nm-tech-cdma-1x", &applet->mb_tech_1x_icon, applet);
-	case MB_TECH_EVDO_REV0:
-	case MB_TECH_EVDO_REVA:
+	case MB_TECH_EVDO:
 		return nma_icon_check_and_load ("nm-tech-evdo", &applet->mb_tech_evdo_icon, applet);
 	case MB_TECH_GSM:
 	case MB_TECH_GPRS:
diff --git a/src/mobile-helpers.h b/src/mobile-helpers.h
index 09efd4c..fecde68 100644
--- a/src/mobile-helpers.h
+++ b/src/mobile-helpers.h
@@ -39,8 +39,7 @@ enum {
 enum {
 	MB_TECH_UNKNOWN = 0,
 	MB_TECH_1XRTT,
-	MB_TECH_EVDO_REV0,
-	MB_TECH_EVDO_REVA,
+	MB_TECH_EVDO,
 	MB_TECH_GSM,
 	MB_TECH_GPRS,
 	MB_TECH_EDGE,