[network-manager-applet: 3/6] applet: create fallback_icon only once in nma_icons_reload()
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet: 3/6] applet: create fallback_icon only once in nma_icons_reload()
- Date: Sun, 13 Mar 2016 11:44:40 +0000 (UTC)
commit 98601313f41b09daeba3482d4b8d9d532e096ea3
Author: Thomas Haller <thaller redhat com>
Date: Sun Mar 13 10:57:51 2016 +0100
applet: create fallback_icon only once in nma_icons_reload()
src/applet.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/applet.c b/src/applet.c
index aaa1b7e..39c6345 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2977,6 +2977,9 @@ nma_icons_reload (NMApplet *applet, gpointer user_data)
g_hash_table_remove_all (applet->icon_cache);
nma_icons_free (applet);
+ if (applet->fallback_icon)
+ return;
+
loader = gdk_pixbuf_loader_new_with_type ("png", &error);
if (!loader)
goto error;
@@ -2990,14 +2993,13 @@ nma_icons_reload (NMApplet *applet, gpointer user_data)
if (!gdk_pixbuf_loader_close (loader, &error))
goto error;
- g_clear_object (&applet->fallback_icon);
applet->fallback_icon = gdk_pixbuf_loader_get_pixbuf (loader);
g_return_if_fail (applet->fallback_icon);
g_object_ref (applet->fallback_icon);
return;
error:
- g_critical ("Failed loading default-icon: %s", error->message);
+ g_critical ("failed loading default-icon: %s", error->message);
g_clear_error (&error);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]