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 /mail/em-folder-browser.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 'mail/em-folder-browser.c')
-rw-r--r-- | mail/em-folder-browser.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 5871cfc4cc..4b25b560f7 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -293,10 +293,19 @@ generate_viewoption_menu (GtkWidget *emfv) for (i = 0; emfb_view_items[i].search.id != -1; ++i) { if (emfb_view_items[i].search.text) { char *str; + str = e_str_without_underscores (_(emfb_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (emfb_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (emfb_view_items[i].image, E_ICON_SIZE_MENU)); + if (emfb_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + emfb_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); @@ -351,8 +360,16 @@ generate_viewoption_menu (GtkWidget *emfv) char *str; str = e_str_without_underscores (_(temp_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (temp_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (temp_view_items[i].image, E_ICON_SIZE_MENU)); + if (temp_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + temp_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); |