Mercurial > pidgin
changeset 23188:eab3ce582cac
merge of '1a20622e5eb611356f66565b96618ab1cfe1e231'
and 'd993fb67df1d01ad9a8a18fef3e8a5de90823875'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 25 May 2008 23:48:50 +0000 |
| parents | 373616d2e552 (diff) 7e0b815d2133 (current diff) |
| children | 849c3d109a38 865c8e53c08e f8a02ba588d1 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sun May 25 22:06:51 2008 +0000 +++ b/pidgin/gtkblist.c Sun May 25 23:48:50 2008 +0000 @@ -3239,7 +3239,7 @@ /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL }, { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgin_dialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, - { N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<Item>", NULL }, + { N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<StockItem>", PIDGIN_STOCK_CHAT }, { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL }, { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },