fixed account selector of compose window having unintended mnemonic.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@909 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 41 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index ab470058..58afe055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-19
 
+	* src/trayicon.c
+	  src/menu.h: fixed account selector of compose window having
+	  unintended mnemonic.
+
+2006-01-19
+
 	* libsylph/imap.c: imap_scan_tree_recursive(): handle virtual folders
 	  properly.
 	* src/folderview.c: folderview_menu_popup(): prohibit new folder under
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 2a981eb7..4db1e1f9 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2006-01-19
 
+	* src/trayicon.c
+	  src/menu.h: メッセージ作成ウィンドウのアカウント選択メニューが意図
+	  せずにニーモニックを持ってしまうのを修正。
+
+2006-01-19
+
 	* libsylph/imap.c: imap_scan_tree_recursive(): 仮想フォルダを適切に
 	  処理するようにした。
 	* src/folderview.c: folderview_menu_popup(): 仮想フォルダの下に新規
diff --git a/src/menu.h b/src/menu.h
index e049e7d2..92d8d5df 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-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 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
@@ -32,6 +32,22 @@
 #define MENUITEM_ADD(menu, menuitem, label, data)			 \
 {									 \
 	if (label)							 \
+		menuitem = gtk_menu_item_new_with_label(label);		 \
+	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_WITH_MNEMONIC(menu, menuitem, label, data)		 \
+{									 \
+	if (label)							 \
 		menuitem = gtk_menu_item_new_with_mnemonic(label);	 \
 	else {								 \
 		menuitem = gtk_menu_item_new();				 \
diff --git a/src/trayicon.c b/src/trayicon.c
index 8455a3b3..5c7be593 100644
--- a/src/trayicon.c
+++ b/src/trayicon.c
@@ -91,30 +91,32 @@ GtkWidget *trayicon_create(MainWindow *mainwin)
 	if (!trayicon_menu) {
 		trayicon_menu = gtk_menu_new();
 		gtk_widget_show(trayicon_menu);
-		MENUITEM_ADD(trayicon_menu, menuitem,
-			     _("Get from _current account"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("Get from _current account"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(trayicon_inc), mainwin);
-		MENUITEM_ADD(trayicon_menu, menuitem,
-			     _("Get from _all accounts"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("Get from _all accounts"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(trayicon_inc_all), mainwin);
-		MENUITEM_ADD(trayicon_menu, menuitem,
-			     _("_Send queued messages"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("_Send queued messages"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(trayicon_send), mainwin);
 
 		MENUITEM_ADD(trayicon_menu, menuitem, NULL, 0);
-		MENUITEM_ADD(trayicon_menu, menuitem,
-			     _("Compose _new message"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("Compose _new message"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(trayicon_compose), mainwin);
 
 		MENUITEM_ADD(trayicon_menu, menuitem, NULL, 0);
-		MENUITEM_ADD(trayicon_menu, menuitem, _("_About"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("_About"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(about_show), NULL);
-		MENUITEM_ADD(trayicon_menu, menuitem, _("E_xit"), 0);
+		MENUITEM_ADD_WITH_MNEMONIC(trayicon_menu, menuitem,
+					   _("E_xit"), 0);
 		g_signal_connect(G_OBJECT(menuitem), "activate",
 				 G_CALLBACK(trayicon_app_exit), mainwin);
 	}