[network-manager-applet] applet: make use of mobile_helper_get_quality_icon_name() function



commit 23b4b49c6e91140ec3014371b846a21c1eb09e79
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 27 14:25:56 2015 +0200

    applet: make use of mobile_helper_get_quality_icon_name() function

 src/ap-menu-item.c       |   11 ++---------
 src/applet-device-wifi.c |   12 ++----------
 2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index b458136..fe5f484 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -33,6 +33,7 @@
 
 #include "ap-menu-item.h"
 #include "nm-access-point.h"
+#include "mobile-helpers.h"
 
 
 G_DEFINE_TYPE (NMNetworkMenuItem, nm_network_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
@@ -105,16 +106,8 @@ update_icon (NMNetworkMenuItem *item, NMApplet *applet)
 
        if (priv->is_adhoc)
                icon_name = "nm-adhoc";
-       else if (priv->int_strength > 80)
-               icon_name = "nm-signal-100";
-       else if (priv->int_strength > 55)
-               icon_name = "nm-signal-75";
-       else if (priv->int_strength > 30)
-               icon_name = "nm-signal-50";
-       else if (priv->int_strength > 5)
-               icon_name = "nm-signal-25";
        else
-               icon_name = "nm-signal-00";
+               icon_name = mobile_helper_get_quality_icon_name (priv->int_strength);
 
        icon = gdk_pixbuf_copy (nma_icon_check_and_load (icon_name, applet));
 
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 91d0ea8..8d5e626 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -37,6 +37,7 @@
 #include "ap-menu-item.h"
 #include "utils.h"
 #include "nma-wifi-dialog.h"
+#include "mobile-helpers.h"
 
 #define ACTIVE_AP_TAG "active-ap"
 
@@ -1277,16 +1278,7 @@ wifi_get_icon (NMDevice *device,
                strength = ap ? nm_access_point_get_strength (ap) : 0;
                strength = MIN (strength, 100);
 
-               if (strength > 80)
-                       *out_icon_name = "nm-signal-100";
-               else if (strength > 55)
-                       *out_icon_name = "nm-signal-75";
-               else if (strength > 30)
-                       *out_icon_name = "nm-signal-50";
-               else if (strength > 5)
-                       *out_icon_name = "nm-signal-25";
-               else
-                       *out_icon_name = "nm-signal-00";
+               *out_icon_name = mobile_helper_get_quality_icon_name (strength);
 
                if (ap) {
                        char *ssid = get_ssid_utf8 (ap);


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