# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1250730726 0
# Node ID 2aabf39b55814501a15bafa8386d9e07afc5a738
# Parent  b289449f3e9f084c5a37e2055e45b84442dc4884# Parent  cf533027c3be6c99ce540b8215d7637f1f58793d
merge of 'e8e119ae079526a36af0f2ac20e7a9c9900f44c1'
     and 'fd4c0f3ddcd7c122d22e7fb569ff904e79df6ffb'

diff -r b289449f3e9f -r 2aabf39b5581 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Aug 20 01:11:26 2009 +0000
+++ b/pidgin/gtkconv.c	Thu Aug 20 01:12:06 2009 +0000
@@ -3139,7 +3139,7 @@
 
 	{ N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
 			0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
-	{ N_("/Conversation/Join a _Chat..."), "<CTL>C", menu_join_chat_cb,
+	{ N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb,
 			0, "<StockItem>", PIDGIN_STOCK_CHAT },
 
 	{ "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },