Mercurial > pidgin
changeset 32682:bfcb739c2e06
Restore missing Join a Chat menu item in UI-factory mode.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 08 Oct 2011 23:01:54 +0000 |
| parents | 744df6452cd0 |
| children | d8c74de25b5f |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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'/>"