From d21dbf8d17ba3c94ea2db9cc85b0de84a29fc714 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Thu, 16 Jun 2011 07:52:45 +0000
Subject: use image menu item for part menu.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2906 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog      |  5 +++++
 src/menu.h     | 19 ++++++++++++++++++-
 src/textview.c |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ed87ee6..7afdfa0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-16
+
+	* src/menu.h
+	  src/textview.c: use image menu item for part menu.
+
 2011-06-15
 
 	* src/textview.[ch]: reuse popup menu for each attachments.
diff --git a/src/menu.h b/src/menu.h
index 3df3c832..270d7b49 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkimagemenuitem.h>
 #include <gtk/gtkradiomenuitem.h>
 
 #define MENU_VAL_ID "Sylpheed::Menu::ValueID"
@@ -62,6 +63,22 @@
 				  GINT_TO_POINTER(data));		\
 }
 
+#define MENUITEM_ADD_FROM_STOCK(menu, menuitem, label, data)		\
+{									\
+	if (label)							\
+		menuitem = gtk_image_menu_item_new_from_stock(label, NULL); \
+	else {								\
+		menuitem = gtk_menu_item_new();				\
+		gtk_widget_set_sensitive(menuitem, FALSE);		\
+	}								\
+	gtk_widget_show(menuitem);					\
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);		\
+	if (data)							\
+		g_object_set_data(G_OBJECT(menuitem),			\
+				  MENU_VAL_ID,				\
+				  GINT_TO_POINTER(data));		\
+}
+
 #define MENUITEM_ADD_RADIO(menu, menuitem, widget, label, data)		\
 {									\
 	if (label) {							\
diff --git a/src/textview.c b/src/textview.c
index da189a16..89b58d2e 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -807,7 +807,7 @@ static void textview_part_menu_create(TextView *textview)
 	menu = gtk_menu_new();
 	textview->popup_menu = menu;
 
-	MENUITEM_ADD_WITH_MNEMONIC(menu, menuitem, _("_Open"), PART_MENU_OPEN);
+	MENUITEM_ADD_FROM_STOCK(menu, menuitem, GTK_STOCK_OPEN, PART_MENU_OPEN);
 	g_signal_connect(G_OBJECT(menuitem), "activate",
 			 G_CALLBACK(textview_part_menu_activated), textview);
 	MENUITEM_ADD_WITH_MNEMONIC(menu, menuitem, _("Open _with..."), PART_MENU_OPEN_WITH);
-- 
cgit v1.2.3