pidgin: 60b08bb2: Only update conversation features if the...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 60b08bb268ca62ab52c6223839341566e945a61d
Parent:   70450bbbbd05b409c54747a58ececea09a31f41e
Author:   qulogic at pidgin.im
Date:     10/08/11 03:44:40
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/60b08bb268ca62ab52c6223839341566e945a61d

Changelog: 

Only update conversation features if they've actually changed. This
prevents an infinite loop through the 'conversation-updated' signal.
Though it can probably be fixed a bit better, since I think it means
pidgin_conv_update_fields gets called twice.

Changes against parent 70450bbbbd05b409c54747a58ececea09a31f41e

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	f257a6b2c0f6d338568a2fac967ad17a8e5ad896
+++ pidgin/gtkconv.c	36455590d2fca8ef44d60d67f6c3f553e9db3ac9
@@ -6962,7 +6962,8 @@ gray_stuff_out(PidginConversation *gtkco
 			buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE;
 		}
 
-		if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) {
+		if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)
+		 && !(features & PURPLE_CONNECTION_NO_IMAGES)) {
 			features |= PURPLE_CONNECTION_NO_IMAGES;
 			purple_conversation_set_features(conv, features);
 		}