diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 9 | ||||
| -rw-r--r-- | e-util/e-icon-factory.c | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 0cd49c9fe6..4e130c781d 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,12 @@ +2004-08-05 Rodrigo Moya <rodrigo@novell.com> + + Fixes #62030 + + * e-icon-factory.c (load_icon): get the icon_key as a new argument + and use that in the call to icon_new(). + (e_icon_factory_get_icon): pass icon_key to load_icon(). + (e_icon_factory_get_icon_list): ditto. + 2004-08-01 JP Rosevear <jpr@novell.com> * e-pilot-util.c (e_pilot_get_sync_source): find the source with diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 3c42d8fbad..14771b4bf0 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -86,7 +86,7 @@ icon_free (Icon *icon) } static Icon * -load_icon (const char *icon_name, int size, int scale) +load_icon (const char *icon_key, const char *icon_name, int size, int scale) { GdkPixbuf *pixbuf, *unscaled = NULL; char *filename = NULL; @@ -153,7 +153,7 @@ load_icon (const char *icon_name, int size, int scale) pixbuf = NULL; } - return icon_new (icon_name, pixbuf); + return icon_new (icon_key, pixbuf); } @@ -293,7 +293,7 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) pthread_mutex_lock (&lock); if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) { - if (!(icon = load_icon (icon_name, size, TRUE))) { + if (!(icon = load_icon (icon_key, icon_name, size, TRUE))) { g_warning ("Icon not found -- %s", icon_name); /* Create an empty icon so that we don't keep spitting @@ -350,7 +350,7 @@ e_icon_factory_get_icon_list (const char *icon_name) sprintf (icon_key, "%dx%d/%s", size, size, icon_name); if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) { - if ((icon = load_icon (icon_name, size, FALSE))) + if ((icon = load_icon (icon_key, icon_name, size, FALSE))) g_hash_table_insert (name_to_icon, icon->name, icon); } |