# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1318114914 0
# Node ID bfcb739c2e066dd882a56930240c74a44dde8527
# Parent  744df6452cd02e2ada224a730dee063b6b0117ad
Restore missing Join a Chat menu item in UI-factory mode.

diff -r 744df6452cd0 -r bfcb739c2e06 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Oct 08 22:49:05 2011 +0000
+++ b/pidgin/gtkconv.c	Sat Oct 08 23:01:54 2011 +0000
@@ -1044,7 +1044,7 @@
 }
 
 static void
-menu_join_chat_cb(gpointer data, guint action, GtkWidget *widget)
+menu_join_chat_cb(GtkAction *action, gpointer data)
 {
 	pidgin_blist_joinchat_show();
 }
@@ -3120,6 +3120,7 @@
 	/* Conversation menu */
 	{ "ConversationMenu", NULL, N_("_Conversation"), NULL, NULL, NULL },
 	{ "NewInstantMessage", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("New Instant _Message..."), "<control>M", NULL, G_CALLBACK(menu_new_conv_cb) },
+	{ "JoinAChat", PIDGIN_STOCK_CHAT, N_("Join a _Chat..."), NULL, NULL, G_CALLBACK(menu_join_chat_cb) },
 	{ "Find", GTK_STOCK_FIND, N_("_Find..."), NULL, NULL, G_CALLBACK(menu_find_cb) },
 	{ "ViewLog", NULL, N_("View _Log"), NULL, NULL, G_CALLBACK(menu_view_log_cb) },
 	{ "SaveAs", GTK_STOCK_SAVE_AS, N_("_Save As..."), NULL, NULL, G_CALLBACK(menu_save_as_cb) },
@@ -3164,6 +3165,7 @@
 	"<menubar name='Conversation'>"
 		"<menu action='ConversationMenu'>"
 			"<menuitem action='NewInstantMessage'/>"
+			"<menuitem action='JoinAChat'/>"
 			"<separator/>"
 			"<menuitem action='Find'/>"
 			"<menuitem action='ViewLog'/>"