diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-icon-factory.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index ea7b1229bd..a368248f01 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2002-07-09 Ettore Perazzoli <ettore@ximian.com> + * e-icon-factory.c (load_icon): Ooops. Swapped the large/small + pixbufs here. Also, plug a leak. + +2002-07-09 Ettore Perazzoli <ettore@ximian.com> + * evolution-test-component.c (setup_custom_storage): Pass NULL for @custom_icon_name to evolution_storage_new_folder(). 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); |