# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1211768165 0
# Node ID f8a02ba588d14118c3020135ec7641b66ec1256e
# Parent  66ccd61eaff6de7fa259d4c29a783a80401a118f# Parent  eab3ce582cacd189d0172c2f7103154ec0d7a0c4
merge of '740f6d249277d1f3ffc01d5fab1a580c2dd8fc79'
     and 'c22d824152072143b7ba7eb8b365c97069c60761'

diff -r 66ccd61eaff6 -r f8a02ba588d1 pidgin/gtkblist.c
--- 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 },