aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog14
-rw-r--r--e-util/e-config.c2
-rw-r--r--e-util/e-event.c2
-rw-r--r--e-util/e-gui-utils.c4
-rw-r--r--e-util/e-icon-factory.c56
-rw-r--r--e-util/e-icon-factory.h4
-rw-r--r--e-util/e-import.c2
-rw-r--r--e-util/e-popup.c10
8 files changed, 18 insertions, 76 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 785383c11b..bd5c7e3e76 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-11 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #546892
+
+ * e-gui-utils.c:
+ * e-popup.c:
+ Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
+
+ * e-icon-factory.c (e_icon_factory_get_image):
+ Kill this function. Use gtk_image_new_from_icon_name().
+
+ * e-icon-factory.c (e_icon_factory_get_icon_list):
+ Kill this function. Use gtk_window_set_icon_name().
+
2008-07-31 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #545568
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 939ade0380..b10a11fd20 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -35,8 +35,6 @@
#include "e-config.h"
-#include <e-util/e-icon-factory.h>
-
#include <glib/gi18n.h>
#define d(x)
diff --git a/e-util/e-event.c b/e-util/e-event.c
index e105bc1aa7..f8d634feec 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -31,8 +31,6 @@
#include "e-event.h"
-#include <e-util/e-icon-factory.h>
-
#include <glib/gi18n.h>
#include <libedataserver/e-msgport.h>
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index c354597153..c4fef1ba16 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -18,7 +18,6 @@
#include <string.h>
#include "e-gui-utils.h"
-#include <e-util/e-icon-factory.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-icon-lookup.h>
@@ -62,7 +61,8 @@ GtkWidget *e_create_image_widget(gchar *name,
GtkWidget *w;
if (string1) {
- w = e_icon_factory_get_image (string1, E_ICON_SIZE_DIALOG);
+ w = gtk_image_new_from_icon_name (
+ string1, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5);
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.
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index 1a0954966e..9cecbbd116 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -50,10 +50,6 @@ char *e_icon_factory_get_icon_filename (const char *icon_name, int icon_siz
GdkPixbuf *e_icon_factory_get_icon (const char *icon_name, int icon_size);
-GtkWidget *e_icon_factory_get_image (const char *icon_name, int icon_size);
-
-GList *e_icon_factory_get_icon_list (const char *icon_name);
-
GdkPixbuf *e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height);
#endif /* _E_ICON_FACTORY_H_ */
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 88a75ac422..da4fffb346 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -35,8 +35,6 @@
#include "e-import.h"
-#include <e-util/e-icon-factory.h>
-
#include <glib/gi18n.h>
#define d(x)
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index f411c2d249..1d2e808bc3 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -31,8 +31,6 @@
#include "e-popup.h"
-#include <e-util/e-icon-factory.h>
-
#include <glib/gi18n.h>
#define d(x)
@@ -357,12 +355,8 @@ ep_build_tree(struct _item_node *inode, guint32 mask)
if (item->image) {
GtkWidget *image;
- /* work-around e-icon-factory not doing GTK_STOCK stuff */
- if (strncmp((char *)item->image, "gtk-", 4) == 0)
- image = gtk_image_new_from_stock((char *)item->image, GTK_ICON_SIZE_MENU);
- else
- image = e_icon_factory_get_image((char *)item->image, E_ICON_SIZE_MENU);
-
+ image = gtk_image_new_from_icon_name (
+ (gchar *) item->image, GTK_ICON_SIZE_MENU);
gtk_widget_show(image);
menuitem = (GtkMenuItem *)gtk_image_menu_item_new();
gtk_image_menu_item_set_image((GtkImageMenuItem *)menuitem, image);