# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211773325 0
# Node ID 865c8e53c08e0890e03fbd93f298e5faf6813e5d
# Parent  d54bc04bfd31f94b0fbe472b273002ad4b017400# Parent  eab3ce582cacd189d0172c2f7103154ec0d7a0c4
merge of 'a06b635ebc40ccdad112528557020cfd60238d88'
     and 'c22d824152072143b7ba7eb8b365c97069c60761'

diff -r d54bc04bfd31 -r 865c8e53c08e pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Mon May 26 03:40:54 2008 +0000
+++ b/pidgin/gtkblist.c	Mon May 26 03:42: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 },