cpw.qulogic.gtk3: 67cd60df: Restore missing Join a Chat menu item in...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 67cd60df7433676301aa8a21a3b462b1030bf59d
Parent:   61770b0935b3b0fbc4e15b86becb9bbfc1f7edfb
Author:   qulogic at pidgin.im
Date:     10/08/11 19:01:54
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/67cd60df7433676301aa8a21a3b462b1030bf59d

Changelog: 

Restore missing Join a Chat menu item in UI-factory mode.

Changes against parent 61770b0935b3b0fbc4e15b86becb9bbfc1f7edfb

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	d743210fc97b8dec1a79b7edada7a196fe4f2f93
+++ pidgin/gtkconv.c	88195e052e96138b4e7b97fc4989df8fbaa217ba
@@ -1044,7 +1044,7 @@ static void
 }
 
 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 @@ static GtkActionEntry menu_entries[] =
 	/* 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 @@ static const char *conversation_menu =
 	"<menubar name='Conversation'>"
 		"<menu action='ConversationMenu'>"
 			"<menuitem action='NewInstantMessage'/>"
+			"<menuitem action='JoinAChat'/>"
 			"<separator/>"
 			"<menuitem action='Find'/>"
 			"<menuitem action='ViewLog'/>"