diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-01-19 09:18:24 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-01-19 09:18:24 +0000 |
commit | 311ee68e535fcad78ee9c94bf63ec631167e2d33 (patch) | |
tree | 3f520dedc40c9d0b54f64aac4dd360923f9adbd3 /src | |
parent | f2d5fbd592db74d3d16c9128ff3b7e2ce32db5f5 (diff) |
fixed account selector of compose window having unintended mnemonic.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@909 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r-- | src/menu.h | 18 | ||||
-rw-r--r-- | src/trayicon.c | 22 |
2 files changed, 29 insertions, 11 deletions
@@ -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); } |