pidgin.2.9.0: 182f2021: applied changes from 1e3728083b5ef50e0df...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 182f20213f2ab838f846247700441713769afcd7
Parent:   33261adfe3a390ba3d8545224305846861682c7c
Author:   markdoliner at pidgin.im
Date:     06/20/11 01:33:07
Branch:   im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/182f20213f2ab838f846247700441713769afcd7

Changelog: 

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.

Changes against parent 33261adfe3a390ba3d8545224305846861682c7c

  patched  ChangeLog
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- ChangeLog	dfd23d8191f494b0d67b89f82d6699090b71e245
+++ ChangeLog	fb7edee9748a81183327c2a32000f0c7067f1526
@@ -1,6 +1,9 @@ version 2.8.1 (MM/DD/YYYY):
 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.
============================================================
--- pidgin/gtkconv.c	4c13dce050cac7488a70ae9f1100f17afd256895
+++ pidgin/gtkconv.c	9719278158199c9cfecd5812787d40b35aa338fa
@@ -6589,7 +6589,7 @@ gray_stuff_out(PidginConversation *gtkco
 
 		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 ||