[network-manager-applet] applet: use hash table for icon caching
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] applet: use hash table for icon caching
- Date: Fri, 5 Dec 2014 18:53:24 +0000 (UTC)
commit 9e037ec34ee6efabbdb7cede0a5b95d995a602bb
Author: Pavel Šimerda <psimerda redhat com>
Date: Mon Nov 24 20:29:54 2014 +0100
applet: use hash table for icon caching
Simplify icon name/pixbuf passing by not having a special cache member
for each icon and prepare for passing names instead of pixbufs.
src/ap-menu-item.c | 12 +++---
src/applet-device-bond.c | 2 +-
src/applet-device-bridge.c | 2 +-
src/applet-device-bt.c | 2 +-
src/applet-device-ethernet.c | 2 +-
src/applet-device-infiniband.c | 2 +-
src/applet-device-team.c | 2 +-
src/applet-device-vlan.c | 2 +-
src/applet-device-wifi.c | 15 +++---
src/applet.c | 97 ++++++++++++----------------------------
src/applet.h | 28 +-----------
src/mobile-helpers.c | 28 ++++++------
12 files changed, 64 insertions(+), 130 deletions(-)
---
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index b345a1c..ca94c32 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -160,21 +160,21 @@ nm_network_menu_item_best_strength (NMNetworkMenuItem * item,
item->int_strength = strength;
if (strength > 80)
- icon = nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon, applet);
+ icon = nma_icon_check_and_load ("nm-signal-100", applet);
else if (strength > 55)
- icon = nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon, applet);
+ icon = nma_icon_check_and_load ("nm-signal-75", applet);
else if (strength > 30)
- icon = nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon, applet);
+ icon = nma_icon_check_and_load ("nm-signal-50", applet);
else if (strength > 5)
- icon = nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon, applet);
+ icon = nma_icon_check_and_load ("nm-signal-25", applet);
else
- icon = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
+ icon = nma_icon_check_and_load ("nm-signal-00", applet);
pixbuf = gdk_pixbuf_copy (icon);
/* If the AP is "secure", composite the lock icon on top of the signal bars */
if (item->is_encrypted) {
- top = nma_icon_check_and_load ("nm-secure-lock", &applet->secure_lock_icon, applet);
+ top = nma_icon_check_and_load ("nm-secure-lock", applet);
gdk_pixbuf_composite (top, pixbuf, 0, 0, gdk_pixbuf_get_width (top),
gdk_pixbuf_get_height (top),
0, 0, 1.0, 1.0,
diff --git a/src/applet-device-bond.c b/src/applet-device-bond.c
index 36e22f7..eab1a38 100644
--- a/src/applet-device-bond.c
+++ b/src/applet-device-bond.c
@@ -123,7 +123,7 @@ bond_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("Bond connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-bridge.c b/src/applet-device-bridge.c
index 4352411..688e342 100644
--- a/src/applet-device-bridge.c
+++ b/src/applet-device-bridge.c
@@ -123,7 +123,7 @@ bridge_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("Bridge connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 580268d..cf2f364 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -136,7 +136,7 @@ bt_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wwan", &applet->wwan_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wwan", applet);
*tip = g_strdup_printf (_("Mobile broadband connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index 6e1c5a3..7d1ef6a 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -180,7 +180,7 @@ ethernet_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting an ethernet network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("Ethernet network connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-infiniband.c b/src/applet-device-infiniband.c
index d72cb09..0a57fa5 100644
--- a/src/applet-device-infiniband.c
+++ b/src/applet-device-infiniband.c
@@ -176,7 +176,7 @@ infiniband_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("InfiniBand connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-team.c b/src/applet-device-team.c
index 9c03784..3b11920 100644
--- a/src/applet-device-team.c
+++ b/src/applet-device-team.c
@@ -119,7 +119,7 @@ team_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("Team connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-vlan.c b/src/applet-device-vlan.c
index 204230c..9bbe6b9 100644
--- a/src/applet-device-vlan.c
+++ b/src/applet-device-vlan.c
@@ -237,7 +237,7 @@ vlan_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-device-wired", applet);
*tip = g_strdup_printf (_("VLAN connection '%s' active"), id);
break;
default:
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index e8ff46f..1060a73 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -553,8 +553,7 @@ create_new_ap_item (NMDeviceWifi *device,
nm_network_menu_item_set_ssid (item, (GByteArray *) ssid);
dev_caps = nm_device_wifi_get_capabilities (device);
- nma_icon_check_and_load ("nm-adhoc", &applet->adhoc_icon, applet);
- nm_network_menu_item_set_detail (item, ap, applet->adhoc_icon, dev_caps);
+ nm_network_menu_item_set_detail (item, ap, nma_icon_check_and_load ("nm-adhoc", applet), dev_caps);
nm_network_menu_item_best_strength (item, nm_access_point_get_strength (ap), applet);
nm_network_menu_item_add_dupe (item, ap);
@@ -1289,22 +1288,22 @@ wifi_get_icon (NMDevice *device,
strength = MIN (strength, 100);
if (strength > 80)
- pixbuf = nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-100", applet);
else if (strength > 55)
- pixbuf = nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-75", applet);
else if (strength > 30)
- pixbuf = nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-50", applet);
else if (strength > 5)
- pixbuf = nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-25", applet);
else
- pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-00", applet);
ssid = get_ssid_utf8 (ap);
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active: %s (%d%%)"),
id, ssid, strength);
g_free (ssid);
} else {
- pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-00", applet);
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active"), id);
}
break;
diff --git a/src/applet.c b/src/applet.c
index 5ee20e7..a1304c1 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2405,8 +2405,7 @@ foo_set_icon (NMApplet *applet, GdkPixbuf *pixbuf, guint32 layer)
applet->icon_layers[layer] = g_object_ref (pixbuf);
if (!applet->icon_layers[0]) {
- nma_icon_check_and_load ("nm-no-connection", &applet->no_connection_icon, applet);
- pixbuf = g_object_ref (applet->no_connection_icon);
+ pixbuf = g_object_ref (nma_icon_check_and_load ("nm-no-connection", applet));
} else {
pixbuf = gdk_pixbuf_copy (applet->icon_layers[0]);
@@ -2771,19 +2770,11 @@ applet_common_get_device_icon (NMDeviceState state, NMApplet *applet)
}
if (stage >= 0) {
- int i, j;
+ char *name = g_strdup_printf ("nm-stage%02d-connecting%02d", stage + 1,
applet->animation_step + 1);
- for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++) {
- char *name;
+ pixbuf = nma_icon_check_and_load (name, applet);
+ g_free (name);
- name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
- nma_icon_check_and_load (name, &applet->network_connecting_icons[i][j],
applet);
- g_free (name);
- }
- }
-
- pixbuf = applet->network_connecting_icons[stage][applet->animation_step];
applet->animation_step++;
if (applet->animation_step >= NUM_CONNECTING_FRAMES)
applet->animation_step = 0;
@@ -2946,12 +2937,12 @@ applet_update_icon (gpointer user_data)
switch (state) {
case NM_STATE_UNKNOWN:
case NM_STATE_ASLEEP:
- pixbuf = nma_icon_check_and_load ("nm-no-connection", &applet->no_connection_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-no-connection", applet);
g_object_ref (pixbuf);
dev_tip = g_strdup (_("Networking disabled"));
break;
case NM_STATE_DISCONNECTED:
- pixbuf = nma_icon_check_and_load ("nm-no-connection", &applet->no_connection_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-no-connection", applet);
g_object_ref (pixbuf);
dev_tip = g_strdup (_("No network connection"));
break;
@@ -2968,25 +2959,20 @@ applet_update_icon (gpointer user_data)
pixbuf = NULL;
active_vpn = applet_get_first_active_vpn_connection (applet, &vpn_state);
if (active_vpn) {
- int i;
+ char *name;
switch (vpn_state) {
case NM_VPN_CONNECTION_STATE_ACTIVATED:
- pixbuf = nma_icon_check_and_load ("nm-vpn-active-lock", &applet->vpn_lock_icon,
applet);
+ pixbuf = nma_icon_check_and_load ("nm-vpn-active-lock", applet);
break;
case NM_VPN_CONNECTION_STATE_PREPARE:
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) {
- char *name;
+ name = g_strdup_printf ("nm-vpn-connecting%02d", applet->animation_step + 1);
+ pixbuf = nma_icon_check_and_load (name, applet);
+ g_free (name);
- name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
- nma_icon_check_and_load (name, &applet->vpn_connecting_icons[i], applet);
- g_free (name);
- }
-
- pixbuf = applet->vpn_connecting_icons[applet->animation_step];
applet->animation_step++;
if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
applet->animation_step = 0;
@@ -3280,73 +3266,41 @@ nma_clear_icon (GdkPixbuf **icon, NMApplet *applet)
static void nma_icons_free (NMApplet *applet)
{
- int i, j;
-
- for (i = 0; i <= ICON_LAYER_MAX; i++)
- nma_clear_icon (&applet->icon_layers[i], applet);
-
- nma_clear_icon (&applet->no_connection_icon, applet);
- nma_clear_icon (&applet->ethernet_icon, applet);
- nma_clear_icon (&applet->adhoc_icon, applet);
- nma_clear_icon (&applet->wwan_icon, applet);
- nma_clear_icon (&applet->wwan_tower_icon, applet);
- nma_clear_icon (&applet->vpn_lock_icon, applet);
- nma_clear_icon (&applet->wifi_00_icon, applet);
- nma_clear_icon (&applet->wifi_25_icon, applet);
- nma_clear_icon (&applet->wifi_50_icon, applet);
- nma_clear_icon (&applet->wifi_75_icon, applet);
- nma_clear_icon (&applet->wifi_100_icon, applet);
- nma_clear_icon (&applet->secure_lock_icon, applet);
-
- nma_clear_icon (&applet->mb_tech_1x_icon, applet);
- nma_clear_icon (&applet->mb_tech_evdo_icon, applet);
- nma_clear_icon (&applet->mb_tech_gprs_icon, applet);
- nma_clear_icon (&applet->mb_tech_edge_icon, applet);
- nma_clear_icon (&applet->mb_tech_umts_icon, applet);
- nma_clear_icon (&applet->mb_tech_hspa_icon, applet);
- nma_clear_icon (&applet->mb_tech_lte_icon, applet);
- nma_clear_icon (&applet->mb_roaming_icon, applet);
- nma_clear_icon (&applet->mb_tech_3g_icon, applet);
-
- for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
- for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
- nma_clear_icon (&applet->network_connecting_icons[i][j], applet);
- }
-
- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
- nma_clear_icon (&applet->vpn_connecting_icons[i], applet);
+ int i;
for (i = 0; i <= ICON_LAYER_MAX; i++)
nma_clear_icon (&applet->icon_layers[i], applet);
}
GdkPixbuf *
-nma_icon_check_and_load (const char *name, GdkPixbuf **icon, NMApplet *applet)
+nma_icon_check_and_load (const char *name, NMApplet *applet)
{
GError *error = NULL;
+ GdkPixbuf *icon = g_hash_table_lookup (applet->icon_cache, name);
g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (icon != NULL, NULL);
g_return_val_if_fail (applet != NULL, NULL);
/* icon already loaded successfully */
- if (*icon && (*icon != applet->fallback_icon))
- return *icon;
+ if (icon)
+ return icon;
/* Try to load the icon; if the load fails, log the problem, and set
* the icon to the fallback icon if requested.
*/
- *icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size,
GTK_ICON_LOOKUP_FORCE_SIZE, &error);
- if (!*icon) {
+ if (!(icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size,
GTK_ICON_LOOKUP_FORCE_SIZE, &error))) {
g_warning ("Icon %s missing: (%d) %s",
name,
error ? error->code : -1,
(error && error->message) ? error->message : "(unknown)");
g_clear_error (&error);
- *icon = applet->fallback_icon;
+ return applet->fallback_icon;
}
- return *icon;
+
+ g_hash_table_insert (applet->icon_cache, g_strdup (name), icon);
+
+ return icon;
}
#include "fallback-icon.h"
@@ -3359,6 +3313,7 @@ nma_icons_reload (NMApplet *applet)
g_return_val_if_fail (applet->icon_size > 0, FALSE);
+ g_hash_table_remove_all (applet->icon_cache);
nma_icons_free (applet);
loader = gdk_pixbuf_loader_new_with_type ("png", &error);
@@ -3611,12 +3566,17 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
g_signal_connect (applet->gsettings, "changed::show-applet",
G_CALLBACK (applet_gsettings_show_changed), applet);
+
/* Load pixmaps and create applet widgets */
if (!setup_widgets (applet)) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC,
"Could not initialize widgets");
return FALSE;
}
+ applet->icon_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ g_object_unref);
nma_icons_init (applet);
if (!notify_is_initted ())
@@ -3727,6 +3687,7 @@ static void finalize (GObject *object)
if (applet->menu)
g_object_unref (applet->menu);
+ g_clear_pointer (&applet->icon_cache, g_hash_table_destroy);
nma_icons_free (applet);
g_free (applet->tip);
diff --git a/src/applet.h b/src/applet.h
index e581634..4ea3d86 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -122,36 +122,11 @@ typedef struct
guint update_icon_id;
GtkIconTheme * icon_theme;
- GdkPixbuf * no_connection_icon;
- GdkPixbuf * ethernet_icon;
- GdkPixbuf * adhoc_icon;
- GdkPixbuf * wwan_icon;
- GdkPixbuf * wifi_00_icon;
- GdkPixbuf * wifi_25_icon;
- GdkPixbuf * wifi_50_icon;
- GdkPixbuf * wifi_75_icon;
- GdkPixbuf * wifi_100_icon;
- GdkPixbuf * secure_lock_icon;
-#define NUM_CONNECTING_STAGES 3
+ GHashTable * icon_cache;
#define NUM_CONNECTING_FRAMES 11
- GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES];
#define NUM_VPN_CONNECTING_FRAMES 14
- GdkPixbuf * vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES];
- GdkPixbuf * vpn_lock_icon;
GdkPixbuf * fallback_icon;
- /* Mobiel Broadband icons */
- GdkPixbuf * wwan_tower_icon;
- GdkPixbuf * mb_tech_1x_icon;
- GdkPixbuf * mb_tech_evdo_icon;
- GdkPixbuf * mb_tech_gprs_icon;
- GdkPixbuf * mb_tech_edge_icon;
- GdkPixbuf * mb_tech_umts_icon;
- GdkPixbuf * mb_tech_hspa_icon;
- GdkPixbuf * mb_tech_lte_icon;
- GdkPixbuf * mb_roaming_icon;
- GdkPixbuf * mb_tech_3g_icon;
-
/* Active status icon pixbufs */
GdkPixbuf * icon_layers[ICON_LAYER_MAX + 1];
@@ -322,7 +297,6 @@ GtkWidget * applet_new_menu_item_helper (NMConnection *connection,
gboolean add_active);
GdkPixbuf * nma_icon_check_and_load (const char *name,
- GdkPixbuf **icon,
NMApplet *applet);
gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index b8f8d5c..eaa64cf 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -40,7 +40,7 @@ mobile_helper_get_status_pixbuf (guint32 quality,
{
GdkPixbuf *pixbuf, *qual_pixbuf, *wwan_pixbuf, *tmp;
- wwan_pixbuf = nma_icon_check_and_load ("nm-wwan-tower", &applet->wwan_tower_icon, applet);
+ wwan_pixbuf = nma_icon_check_and_load ("nm-wwan-tower", applet);
if (!quality_valid)
quality = 0;
@@ -71,7 +71,7 @@ mobile_helper_get_status_pixbuf (guint32 quality,
/* And finally the roaming or technology icon */
if (state == MB_STATE_ROAMING) {
- tmp = nma_icon_check_and_load ("nm-mb-roam", &applet->mb_roaming_icon, applet);
+ tmp = nma_icon_check_and_load ("nm-mb-roam", applet);
gdk_pixbuf_composite (tmp, pixbuf, 0, 0,
gdk_pixbuf_get_width (tmp),
gdk_pixbuf_get_height (tmp),
@@ -96,15 +96,15 @@ GdkPixbuf *
mobile_helper_get_quality_icon (guint32 quality, NMApplet *applet)
{
if (quality > 80)
- return nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-100", applet);
else if (quality > 55)
- return nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-75", applet);
else if (quality > 30)
- return nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-50", applet);
else if (quality > 5)
- return nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-25", applet);
- return nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-00", applet);
}
GdkPixbuf *
@@ -112,23 +112,23 @@ 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);
+ return nma_icon_check_and_load ("nm-tech-cdma-1x", applet);
case MB_TECH_EVDO:
- return nma_icon_check_and_load ("nm-tech-evdo", &applet->mb_tech_evdo_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-evdo", applet);
case MB_TECH_GSM:
case MB_TECH_GPRS:
- return nma_icon_check_and_load ("nm-tech-gprs", &applet->mb_tech_gprs_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-gprs", applet);
case MB_TECH_EDGE:
- return nma_icon_check_and_load ("nm-tech-edge", &applet->mb_tech_edge_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-edge", applet);
case MB_TECH_UMTS:
- return nma_icon_check_and_load ("nm-tech-umts", &applet->mb_tech_umts_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-umts", applet);
case MB_TECH_HSDPA:
case MB_TECH_HSUPA:
case MB_TECH_HSPA:
case MB_TECH_HSPA_PLUS:
- return nma_icon_check_and_load ("nm-tech-hspa", &applet->mb_tech_hspa_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-hspa", applet);
case MB_TECH_LTE:
- return nma_icon_check_and_load ("nm-tech-lte", &applet->mb_tech_lte_icon, applet);
+ return nma_icon_check_and_load ("nm-tech-lte", applet);
case MB_TECH_WIMAX:
default:
return NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
