Mercurial > pidgin

changeset 32269:599f8901a5e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 08 Oct 2011 07:44:40 +0000
parents 29f1a6b07b9b
children 823c7f451700 787609e41f20
files pidgin/gtkconv.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 		}