# HG changeset patch # User Elliott Sales de Andrade # Date 1318059880 0 # Node ID 599f8901a5e0c5297e3ab43f3edd3c9ee89120ef # Parent 29f1a6b07b9bb1761fe653c56addcb25899cadbe 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. diff -r 29f1a6b07b9b -r 599f8901a5e0 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Oct 08 07:35:35 2011 +0000 +++ b/pidgin/gtkconv.c Sat Oct 08 07:44:40 2011 +0000 @@ -6962,7 +6962,8 @@ 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); }