# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1248230096 0
# Node ID 38f09799476a2eeed4c49fbe5bc3ca9c136d4022
# Parent  20798dc089af2a3923db52e9ba298761d8c3603c
Didn't realize I hadn't pushed this before the string freeze so we get to do
it here instead.

*** Plucked rev 6b146c92bd0f878c7321a914c74044d50273abcf (deryni@pidgin.im):
I noticed the other day that we don't have a \"Join a Chat\" menu item in the
Conversation menu. This fixes that.

diff -r 20798dc089af -r 38f09799476a pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Jul 21 05:17:09 2009 +0000
+++ b/pidgin/gtkconv.c	Wed Jul 22 02:34:56 2009 +0000
@@ -959,6 +959,12 @@
 }
 
 static void
+menu_join_chat_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	pidgin_blist_joinchat_show();
+}
+
+static void
 savelog_writefile_cb(void *user_data, const char *filename)
 {
 	PurpleConversation *conv = (PurpleConversation *)user_data;
@@ -3133,6 +3139,8 @@
 
 	{ 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,
+			0, "<StockItem>", PIDGIN_STOCK_CHAT },
 
 	{ "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },