Mercurial > pidgin
diff src/gtkconv.c @ 12099:3960def0f75b
[gaim-migrate @ 14396]
A small part of sf patch 1350631, from Sadrul Habib Chowdhury
Gray out the "insert image" menu item based on a dumb flag
that we shouldn't have that determines whether a particular
conversation supports images or not. See my comments on the
patch for more info.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 15 Nov 2005 01:23:04 +0000 |
parents | 980c877bd238 |
children | 8c6ea55c84a4 |
line wrap: on
line diff
--- a/src/gtkconv.c Tue Nov 15 01:08:45 2005 +0000 +++ b/src/gtkconv.c Tue Nov 15 01:23:04 2005 +0000 @@ -3430,6 +3430,8 @@ 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); @@ -4910,7 +4912,7 @@ gtk_widget_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL)); gtk_widget_set_sensitive(win->menu.block, (prpl_info->add_deny != NULL)); gtk_widget_set_sensitive(win->menu.insert_link, (conv->features & GAIM_CONNECTION_HTML)); - gtk_widget_set_sensitive(win->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE)); + gtk_widget_set_sensitive(win->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE) && !(conv->features & GAIM_CONNECTION_NO_IMAGES)); if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {