From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- e-util/e-icon-factory.c | 56 ------------------------------------------------- 1 file changed, 56 deletions(-) (limited to 'e-util/e-icon-factory.c') diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 457735f90b..2ca724c5f2 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -353,62 +353,6 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) return pixbuf; } -GtkWidget * -e_icon_factory_get_image (const char *icon_name, int icon_size) -{ - GdkPixbuf *pixbuf; - GtkWidget *image; - - pixbuf = e_icon_factory_get_icon (icon_name, icon_size); - image = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - - return image; -} - -/** - * e_icon_factory_get_icon_list: - * @icon_name: name of the icon - * - * Returns a list of GdkPixbufs of the requested name suitable for - * gtk_window_set_icon_list(). - **/ -GList * -e_icon_factory_get_icon_list (const char *icon_name) -{ - static int icon_list_sizes[] = { 128, 64, 48, 32, 16 }; - GList *list = NULL; - char *icon_key; - Icon *icon; - int size, i; - - if (!icon_name || !strcmp (icon_name, "")) - return NULL; - - g_static_mutex_lock (&mutex); - - icon_key = g_alloca (strlen (icon_name) + 9); - - for (i = 0; i < G_N_ELEMENTS (icon_list_sizes); i++) { - size = icon_list_sizes[i]; - 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_key, icon_name, size, FALSE))) - g_hash_table_insert (name_to_icon, icon->name, icon); - } - - if (icon && icon->pixbuf) { - list = g_list_prepend (list, icon->pixbuf); - g_object_ref (icon->pixbuf); - } - } - - g_static_mutex_unlock (&mutex); - - return list; -} - /** * e_icon_factory_pixbuf_scale * Scales pixbuf to desired size. -- cgit v1.2.3