aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-browser.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/em-folder-browser.c')
-rw-r--r--mail/em-folder-browser.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index d1d03dc47e..fff9fa7c98 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 ();