[network-manager-applet/NMA_0_8] cdma: enable registration state home/roaming notifications

[Dan Williams <dcbw src gnome org>]

commit ae61ca854f8f5406b6a1280dc152e5af30faa61b
Author: Andrew Bird <ajb spheresystems co uk>
Date:   Tue Jul 19 16:27:03 2011 -0500

    cdma: enable registration state home/roaming notifications
    
    The current UI requires the user to mouse-over and reveal a tool
    tip (or click an indicator) to discover the registration state
    (aka polling). If the user inadvertently re-registers on a
    roaming network, the operation is silent until the user decides
    to check the applet for network status, possibly incurring
    expensive roaming tariffs in the mean time.
    
    So to prevent silent registration changes, alert the user with a
    notification when the CDMA registration status changes to home or
    to roaming.

 src/applet-device-cdma.c |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index e4a401b..97bc7c9 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -640,6 +640,44 @@ cdma_device_info_free (gpointer data)
 }
 
 static void
+notify_user_of_cdma_reg_change (CdmaDeviceInfo *info)
+{
+	guint32 mb_state = cdma_state_to_mb_state (info);
+
+	if (mb_state == MB_STATE_HOME) {
+		applet_do_notify_with_pref (info->applet,
+		                            _("CDMA network."),
+		                            _("You are now registered on the home network."),
+		                            "nm-signal-100",
+		                            PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+	} else if (mb_state == MB_STATE_ROAMING) {
+		applet_do_notify_with_pref (info->applet,
+		                            _("CDMA network."),
+		                            _("You are now registered on a roaming network."),
+		                            "nm-signal-100",
+		                            PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+	}
+}
+
+static void
+update_registration_state (CdmaDeviceInfo *info,
+                           guint32 new_cdma1x_state,
+                           guint32 new_evdo_state)
+{
+	guint32 old_mb_state = cdma_state_to_mb_state (info);
+
+	if (   (info->cdma1x_state != new_cdma1x_state)
+	    || (info->evdo_state != new_evdo_state)) {
+		info->cdma1x_state = new_cdma1x_state;
+		info->evdo_state = new_evdo_state;
+	}
+
+	/* Use the composite state to notify of home/roaming changes */
+	if (cdma_state_to_mb_state (info) != old_mb_state)
+		notify_user_of_cdma_reg_change (info);
+}
+
+static void
 reg_state_reply (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 {
 	CdmaDeviceInfo *info = user_data;
@@ -650,8 +688,7 @@ reg_state_reply (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 	                           G_TYPE_UINT, &cdma1x_state,
 	                           G_TYPE_UINT, &evdo_state,
 	                           G_TYPE_INVALID)) {
-		info->cdma1x_state = cdma1x_state;
-		info->evdo_state = evdo_state;
+		update_registration_state (info, cdma1x_state, evdo_state);
 		applet_schedule_update_icon (info->applet);
 	}
 
@@ -839,10 +876,8 @@ reg_state_changed_cb (DBusGProxy *proxy,
 {
 	CdmaDeviceInfo *info = user_data;
 
-	info->cdma1x_state = cdma1x_state;
-	info->evdo_state = evdo_state;
+	update_registration_state (info, cdma1x_state, evdo_state);
 	info->skip_reg_poll = TRUE;
-
 	applet_schedule_update_icon (info->applet);
 }