# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1211759330 0
# Node ID eab3ce582cacd189d0172c2f7103154ec0d7a0c4
# Parent  373616d2e5520e45bbcda2c9839ed595f3b5abcf# Parent  7e0b815d21339b92e4774211439395ff5d519d9a
merge of '1a20622e5eb611356f66565b96618ab1cfe1e231'
     and 'd993fb67df1d01ad9a8a18fef3e8a5de90823875'

diff -r 7e0b815d2133 -r eab3ce582cac pidgin/gtkblist.c
--- 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 },