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-popup.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'e-util/e-popup.c') 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 - #include #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); -- cgit v1.2.3