comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- custom_smiley
- changeset 23010
- 6230fac29cee
- parent 23008
- 49781f4819df
- child 23289
- 91b0e34f4a88
equal
deleted
inserted
replaced
| 23009:0bac25fdc9aa | 23010:6230fac29cee |
|---|---|
| 6372 if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) | 6372 if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) |
| 6373 conv->features |= PURPLE_CONNECTION_NO_IMAGES; | 6373 conv->features |= PURPLE_CONNECTION_NO_IMAGES; |
| 6374 | 6374 |
| 6375 if(conv->features & PURPLE_CONNECTION_NO_IMAGES) | 6375 if(conv->features & PURPLE_CONNECTION_NO_IMAGES) |
| 6376 buttons &= ~GTK_IMHTML_IMAGE; | 6376 buttons &= ~GTK_IMHTML_IMAGE; |
| 6377 | |
| 6378 if (conv->features & PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY) | |
| 6379 buttons |= GTK_IMHTML_CUSTOM_SMILEY; | |
| 6380 else | |
| 6381 buttons &= ~GTK_IMHTML_CUSTOM_SMILEY; | |
| 6377 | 6382 |
| 6378 gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons); | 6383 gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons); |
| 6379 if (account != NULL) | 6384 if (account != NULL) |
| 6380 gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), purple_account_get_protocol_id(account)); | 6385 gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), purple_account_get_protocol_id(account)); |
| 6381 | 6386 |
