changeset
Only update conversation features if they've actually changed. This
Sat, 08 Oct 2011 07:44:40 +0000
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Sat, 08 Oct 2011 07:44:40 +0000
- changeset 32642
- 464220c63016
- parent 32641
- 9639ba0ae7cd
- child 32643
- c7ba76b54779
- child 32900
- 9985c4a0e27b
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.
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- 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); }
