# HG changeset patch # User Elliott Sales de Andrade # Date 1330244497 0 # Node ID 4f2ea402cdc893c502be2d7cc0d0bb34a7d879a4 # Parent 49ee5dbf4c3e92b6cbc0edce4e9d8a3ff87aeac6 Restore a minor comment. diff -r 49ee5dbf4c3e -r 4f2ea402cdc8 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sun Feb 26 07:55:12 2012 +0000 +++ b/pidgin/gtkconv.c Sun Feb 26 08:21:37 2012 +0000 @@ -3372,7 +3372,7 @@ gtk_action_set_sensitive(win->video_call, caps & PURPLE_MEDIA_CAPS_VIDEO ? TRUE : FALSE); - gtk_action_set_sensitive(win->audio_video_call, + gtk_action_set_sensitive(win->audio_video_call, caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO ? TRUE : FALSE); } else if (purple_conversation_get_type(conv) @@ -3601,6 +3601,9 @@ win->menu.menubar = gtk_ui_manager_get_widget(win->menu.ui, "/Conversation"); + /* Make sure the 'Conversation -> More' menuitems are regenerated whenever + * the 'Conversation' menu pops up because the entries can change after the + * conversation is created. */ menuitem = gtk_ui_manager_get_widget(win->menu.ui, "/Conversation/ConversationMenu"); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menubar_activated), win);