aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-icon-factory.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-10 05:24:50 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-10 05:24:50 +0800
commitacc4f49390ff292b9820d2f05cb0bb1ad27e2af2 (patch)
tree7bc919594a58ba5ac08aecd73b1f4c1820aad007 /shell/e-icon-factory.c
parenta4d7dffa859bc6023376035cf50ad7e8ebcef520 (diff)
downloadgsoc2013-evolution-acc4f49390ff292b9820d2f05cb0bb1ad27e2af2.tar.gz
gsoc2013-evolution-acc4f49390ff292b9820d2f05cb0bb1ad27e2af2.tar.zst
gsoc2013-evolution-acc4f49390ff292b9820d2f05cb0bb1ad27e2af2.zip
(load_icon): Ooops. Swapped the large/small
pixbufs here. Also, plug a leak. svn path=/trunk/; revision=17399
Diffstat (limited to 'shell/e-icon-factory.c')
-rw-r--r--shell/e-icon-factory.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/shell/e-icon-factory.c b/shell/e-icon-factory.c
index 33658a071f..aeccb8f3a6 100644
--- a/shell/e-icon-factory.c
+++ b/shell/e-icon-factory.c
@@ -93,18 +93,17 @@ load_icon (const char *icon_name)
Icon *icon;
char *path;
- path = g_strconcat (EVOLUTION_IMAGES, "/", icon_name, ".png", NULL);
+ path = g_strconcat (EVOLUTION_IMAGES, "/", icon_name, "-mini.png", NULL);
small_pixbuf = gdk_pixbuf_new_from_file (path);
- if (small_pixbuf == NULL)
- return NULL;
g_free (path);
- path = g_strconcat (EVOLUTION_IMAGES, "/", icon_name, "-mini.png", NULL);
+ path = g_strconcat (EVOLUTION_IMAGES, "/", icon_name, ".png", NULL);
large_pixbuf = gdk_pixbuf_new_from_file (path);
- if (large_pixbuf == NULL)
- return NULL;
g_free (path);
+ if (large_pixbuf == NULL || small_pixbuf == NULL)
+ return NULL;
+
icon = icon_new (icon_name, small_pixbuf, large_pixbuf);
gdk_pixbuf_unref (small_pixbuf);