pidgin/ljfisher-ssl-client-auth

applied changes from 64a3b3dde6e25c7b9fa7d1cfc51f364825d7ae6f
release-2.9.0
2011-06-20, Mark Doliner
ec1aeab6f886
Parents e5cf84327279
Children a3444a0a5fef
applied changes from 64a3b3dde6e25c7b9fa7d1cfc51f364825d7ae6f
through 2b0f393ea00c997bf3ebf4377074aac97d58b8f1

Original commit message:
So, it seems gtkconv checks on stuff in the prpl struct. The lack of
add_buddy in AIM and MSN disabled the Conversation->Add menu item.
Found by deryni.
2 files changed, 4 insertions(+), 1 deletions(-)
  • +3 -0
    ChangeLog
  • +1 -1
    pidgin/gtkconv.c
    • --- a/ChangeLog Mon Jun 20 05:32:40 2011 +0000
    +++ b/ChangeLog Mon Jun 20 05:33:07 2011 +0000
    @@ -1,6 +1,9 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    version 2.8.1 (MM/DD/YYYY):
    + Pidgin:
    + * Fix Conversation->Add on AIM and MSN.
    +
    libpurple:
    * media: Actually use the specified TCP port from the TURN configuration to
    create a TCP relay candidate.
    --- a/pidgin/gtkconv.c Mon Jun 20 05:32:40 2011 +0000
    +++ b/pidgin/gtkconv.c Mon Jun 20 05:33:07 2011 +0000
    @@ -6589,7 +6589,7 @@
    if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
    {
    - gtk_widget_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL));
    + gtk_widget_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL) || (prpl_info->add_buddy_with_invite != NULL));
    gtk_widget_set_sensitive(win->menu.remove, (prpl_info->remove_buddy != NULL));
    gtk_widget_set_sensitive(win->menu.send_file,
    (prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||