diff options
author | Dan Winship <danw@src.gnome.org> | 2004-04-30 22:44:39 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2004-04-30 22:44:39 +0800 |
commit | 448012d42619872149723008d6490497ed24618a (patch) | |
tree | dbc335f736e0605d67a790bee1c986f0acd4037f /e-util | |
parent | c53adc7047817bc8ca067bb59ab6b5a1414de909 (diff) | |
download | gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar.gz gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar.bz2 gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar.lz gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar.xz gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.tar.zst gsoc2013-evolution-448012d42619872149723008d6490497ed24618a.zip |
Make this work for non-stock icons too.
* e-icon-factory.c (load_icon): Make this work for non-stock icons
too.
svn path=/trunk/; revision=25710
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/ChangeLog | 5 | ||||
-rw-r--r-- | e-util/e-icon-factory.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 76c681c60f..0440770b53 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2004-04-30 Dan Winship <danw@ximian.com> + + * e-icon-factory.c (load_icon): Make this work for non-stock icons + too. + 2004-04-22 Not Zed <NotZed@Ximian.com> * e-icon-factory.c (e_icon_factory_get_icon_list): make sure we diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 1a74c34ff0..f59d5dba55 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -109,9 +109,11 @@ load_icon (const char *icon_name) int size = sizes[i]; if (!(filename = gnome_icon_theme_lookup_icon (icon_theme, icon_name, size, NULL, NULL))) - goto exception; + filename = g_strdup (icon_name); unscaled = gdk_pixbuf_new_from_file (filename, NULL); + if (!unscaled) + goto exception; pixbufs[i] = gdk_pixbuf_scale_simple (unscaled, size, size, GDK_INTERP_BILINEAR); g_object_unref (unscaled); g_free (filename); |