Mercurial > pidgin
comparison src/gtkconv.c @ 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 | 3960def0f75b |
children | e75ef7aa913e |
comparison
equal
deleted
inserted
replaced
12100:383226e075f2 | 12101:8c6ea55c84a4 |
---|---|
3428 | 3428 |
3429 /* Setup gtkihmtml. */ | 3429 /* Setup gtkihmtml. */ |
3430 frame = gaim_gtk_create_imhtml(FALSE, >kconv->imhtml, NULL); | 3430 frame = gaim_gtk_create_imhtml(FALSE, >kconv->imhtml, NULL); |
3431 gtk_widget_set_name(gtkconv->imhtml, "gaim_gtkconv_imhtml"); | 3431 gtk_widget_set_name(gtkconv->imhtml, "gaim_gtkconv_imhtml"); |
3432 gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), TRUE); | 3432 gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), TRUE); |
3433 gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->imhtml), | |
3434 gtk_imhtml_get_format_functions(GTK_IMHTML(gtkconv->imhtml)) | GTK_IMHTML_IMAGE); | |
3435 gtk_paned_pack1(GTK_PANED(hpaned), frame, TRUE, TRUE); | 3433 gtk_paned_pack1(GTK_PANED(hpaned), frame, TRUE, TRUE); |
3436 gtk_widget_show(frame); | 3434 gtk_widget_show(frame); |
3437 | 3435 |
3438 gtk_widget_set_size_request(gtkconv->imhtml, | 3436 gtk_widget_set_size_request(gtkconv->imhtml, |
3439 gaim_prefs_get_int("/gaim/gtk/conversations/chat/default_width"), | 3437 gaim_prefs_get_int("/gaim/gtk/conversations/chat/default_width"), |
3894 pane = setup_im_pane(gtkconv); | 3892 pane = setup_im_pane(gtkconv); |
3895 } else if (conv_type == GAIM_CONV_TYPE_CHAT) { | 3893 } else if (conv_type == GAIM_CONV_TYPE_CHAT) { |
3896 gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane)); | 3894 gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane)); |
3897 pane = setup_chat_pane(gtkconv); | 3895 pane = setup_chat_pane(gtkconv); |
3898 } | 3896 } |
3897 | |
3898 gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->imhtml), | |
3899 gtk_imhtml_get_format_functions(GTK_IMHTML(gtkconv->imhtml)) | GTK_IMHTML_IMAGE); | |
3899 | 3900 |
3900 if (pane == NULL) { | 3901 if (pane == NULL) { |
3901 if (conv_type == GAIM_CONV_TYPE_CHAT) | 3902 if (conv_type == GAIM_CONV_TYPE_CHAT) |
3902 g_free(gtkconv->u.chat); | 3903 g_free(gtkconv->u.chat); |
3903 else if (conv_type == GAIM_CONV_TYPE_IM) | 3904 else if (conv_type == GAIM_CONV_TYPE_IM) |