diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
| commit | 7ade227e6409c98a4010992450e111cf7bb10520 (patch) | |
| tree | bdd716d894ae2f3b1affaa6bb68950a89441db13 /e-util/e-popup.c | |
| parent | cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff) | |
| download | gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2 gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip | |
Merge revisions 35951:35992 from trunk.
svn path=/branches/kill-bonobo/; revision=35994
Diffstat (limited to 'e-util/e-popup.c')
| -rw-r--r-- | e-util/e-popup.c | 10 |
1 files changed, 2 insertions, 8 deletions
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); |