Mercurial > pidgin.yaz
changeset 23209:f8a02ba588d1
merge of '740f6d249277d1f3ffc01d5fab1a580c2dd8fc79'
and 'c22d824152072143b7ba7eb8b365c97069c60761'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 26 May 2008 02:16:05 +0000 |
| parents | 66ccd61eaff6 (current diff) eab3ce582cac (diff) |
| children | d3fb9d9b57e2 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sun May 25 23:48:57 2008 +0000 +++ b/pidgin/gtkblist.c Mon May 26 02:16:05 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 },