changeset
merge of '3911f16f4d0c5338685fcd9b83ce2635cfed4802'
Mon, 26 May 2008 02:16:05 +0000
- author
- Will Thompson <resiak@pidgin.im>
- date
- Mon, 26 May 2008 02:16:05 +0000
- changeset 23336
- 0b46dc3c3f59
- parent 23332
- 3911f16f4d0c (current diff)
- parent 23334
- b59937f4ab22 (diff)
- child 23337
- 2643da079f95
merge of '3911f16f4d0c5338685fcd9b83ce2635cfed4802'
and 'b59937f4ab22518460f422b4b30a5290621e87c0'
--- 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 },
