Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 32731:599f8901a5e0
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 | 2ec94166be43 |
comparison
equal
deleted
inserted
replaced
| 32730:29f1a6b07b9b | 32731:599f8901a5e0 |
|---|---|
| 6960 buttons &= ~GTK_IMHTML_LINKDESC; | 6960 buttons &= ~GTK_IMHTML_LINKDESC; |
| 6961 } else { | 6961 } else { |
| 6962 buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE; | 6962 buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE; |
| 6963 } | 6963 } |
| 6964 | 6964 |
| 6965 if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) { | 6965 if (!(prpl_info->options & OPT_PROTO_IM_IMAGE) |
| 6966 && !(features & PURPLE_CONNECTION_NO_IMAGES)) { | |
| 6966 features |= PURPLE_CONNECTION_NO_IMAGES; | 6967 features |= PURPLE_CONNECTION_NO_IMAGES; |
| 6967 purple_conversation_set_features(conv, features); | 6968 purple_conversation_set_features(conv, features); |
| 6968 } | 6969 } |
| 6969 | 6970 |
| 6970 if (features & PURPLE_CONNECTION_NO_IMAGES) | 6971 if (features & PURPLE_CONNECTION_NO_IMAGES) |