[network-manager-applet/wimax] wimax: fix up menu item display

[Dan Williams <dcbw src gnome org>]

commit 80443c35dd0e95e886111b322cc7ab37f3ff9dc0
Author: Dan Williams <dcbw redhat com>
Date:   Wed Jan 5 09:53:59 2011 -0600

    wimax: fix up menu item display
    
    NSPs shouldn't be bold.

 src/applet-device-wimax.c |   14 ++------------
 src/mb-menu-item.c        |   21 +++++++++++++++------
 2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
index d03a8c2..7773410 100644
--- a/src/applet-device-wimax.c
+++ b/src/applet-device-wimax.c
@@ -139,23 +139,13 @@ new_nsp_menu_item (NMDeviceWimax *device,
                    NMApplet *applet)
 {
 	GtkWidget *item;
-	const char *cname;
-	NMSettingConnection *s_con;
 	WimaxMenuItemInfo *info;
 
 	g_return_val_if_fail (nsp != NULL, NULL);
 
-	if (connection) {
-		s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
-		g_assert (s_con);
-
-		cname = nm_setting_connection_get_id (s_con);
-	} else
-		cname = nm_wimax_nsp_get_name (nsp);
-
-	item = nm_mb_menu_item_new (cname,
+	item = nm_mb_menu_item_new (nm_wimax_nsp_get_name (nsp),
 		                        nm_wimax_nsp_get_signal_quality (nsp),
-		                        nm_wimax_nsp_get_name (nsp),
+		                        NULL,
 		                        MB_TECH_WIMAX,
 		                        nsp_type_to_mb_state (nm_wimax_nsp_get_network_type (nsp)),
 		                        TRUE,
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index c4357e8..2447576 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -89,7 +89,7 @@ nm_mb_menu_item_new (const char *connection_name,
 {
 	NMMbMenuItem *item;
 	NMMbMenuItemPrivate *priv;
-	const char *tech_name;
+	const char *tech_name = NULL;
 
 	item = g_object_new (NM_TYPE_MB_MENU_ITEM, NULL);
 	if (!item)
@@ -98,8 +98,11 @@ nm_mb_menu_item_new (const char *connection_name,
 	priv = NM_MB_MENU_ITEM_GET_PRIVATE (item);
 	priv->int_strength = strength;
 
+	/* WiMAX doesn't show tech name */
+	if (technology != MB_TECH_WIMAX)
+		tech_name = get_tech_name (technology);
+
 	/* Construct the description string */
-	tech_name = get_tech_name (technology);
 	switch (state) {
 	default:
 	case MB_STATE_UNKNOWN:
@@ -168,10 +171,16 @@ nm_mb_menu_item_new (const char *connection_name,
 	if (enabled && connection_name) {
 		char *markup;
 
-		gtk_label_set_use_markup (GTK_LABEL (priv->desc), TRUE);
-		markup = g_markup_printf_escaped ("<b>%s</b>", priv->desc_string);
-		gtk_label_set_markup (GTK_LABEL (priv->desc), markup);
-		g_free (markup);
+		if (technology == MB_TECH_WIMAX) {
+			/* WiMAX NSPs aren't shown in bold */
+			gtk_label_set_use_markup (GTK_LABEL (priv->desc), FALSE);
+			gtk_label_set_text (GTK_LABEL (priv->desc), priv->desc_string);
+		} else {
+			gtk_label_set_use_markup (GTK_LABEL (priv->desc), TRUE);
+			markup = g_markup_printf_escaped ("<b>%s</b>", priv->desc_string);
+			gtk_label_set_markup (GTK_LABEL (priv->desc), markup);
+			g_free (markup);
+		}
 		gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
 	} else {
 		/* Disconnected and disabled states */