Mercurial > pidgin
changeset 12101:8c6ea55c84a4
[gaim-migrate @ 14398]
Sadrul noticed that my change for patch 1350631 (showing
images in conv windows) wasn't correct.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 15 Nov 2005 04:37:23 +0000 |
parents | 383226e075f2 |
children | 8df87db79bad |
files | src/gtkconv.c |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Tue Nov 15 04:33:22 2005 +0000 +++ b/src/gtkconv.c Tue Nov 15 04:37:23 2005 +0000 @@ -3430,8 +3430,6 @@ frame = gaim_gtk_create_imhtml(FALSE, >kconv->imhtml, NULL); gtk_widget_set_name(gtkconv->imhtml, "gaim_gtkconv_imhtml"); gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), TRUE); - gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->imhtml), - gtk_imhtml_get_format_functions(GTK_IMHTML(gtkconv->imhtml)) | GTK_IMHTML_IMAGE); gtk_paned_pack1(GTK_PANED(hpaned), frame, TRUE, TRUE); gtk_widget_show(frame); @@ -3897,6 +3895,9 @@ pane = setup_chat_pane(gtkconv); } + gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->imhtml), + gtk_imhtml_get_format_functions(GTK_IMHTML(gtkconv->imhtml)) | GTK_IMHTML_IMAGE); + if (pane == NULL) { if (conv_type == GAIM_CONV_TYPE_CHAT) g_free(gtkconv->u.chat);