cpw.darkrain42.2.6.1: 7313bb3a: Didn't realize I hadn't pushed this befo...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 7313bb3a50bfb81413f4fb007c26df5836a97397
Ancestor: 332d1af74ab7f176a1bfa1fb18690fba5fe56ccb
Author: deryni at pidgin.im
Date: 2009-07-22T02:34:56
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/7313bb3a50bfb81413f4fb007c26df5836a97397

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Didn't realize I hadn't pushed this before the string freeze so we get to do
it here instead.

*** Plucked rev 6b146c92bd0f878c7321a914c74044d50273abcf (deryni at 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.


-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	f42bb456c67102ab14b7061a91b6728a06f28a3c
+++ pidgin/gtkconv.c	a4ea6e49a687f9040a1a12b7129f24e3119ffff2
@@ -959,6 +959,12 @@ static void
 }
 
 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 @@ static GtkItemFactoryEntry menu_items[] 
 
 	{ 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 },