Mercurial > pidgin.yaz
changeset 32148:0f75ff04b8b6
applied changes from 1e3728083b5ef50e0df8972a39da09a1ddea8417
through d017acaf2df9b841859c8f49442ec64e3d752dd4
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.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 20 Jun 2011 05:33:07 +0000 |
| parents | 88241dbf2a6b |
| children | 5f3df5c14c0e |
| files | ChangeLog pidgin/gtkconv.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 ||