Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 18167:b8b475f31008
Fix setting the sensitivity of the toolbar items in a number of places
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 17 Jun 2007 18:10:47 +0000 |
| parents | 9b9e202eb449 |
| children | a8c701d877aa 90d558470507 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Jun 17 16:55:45 2007 +0000 +++ b/pidgin/gtkconv.c Sun Jun 17 18:10:47 2007 +0000 @@ -5981,8 +5981,10 @@ buttons = GTK_IMHTML_SMILEY | GTK_IMHTML_IMAGE; } - if (!(prpl_info->options & OPT_PROTO_IM_IMAGE) || - conv->features & PURPLE_CONNECTION_NO_IMAGES) + if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) + conv->features |= PURPLE_CONNECTION_NO_IMAGES; + + if(conv->features & PURPLE_CONNECTION_NO_IMAGES) buttons &= ~GTK_IMHTML_IMAGE; gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons); @@ -5995,7 +5997,7 @@ gtk_widget_set_sensitive(win->menu.get_info, (prpl_info->get_info != NULL)); gtk_widget_set_sensitive(win->menu.invite, (prpl_info->chat_invite != NULL)); gtk_widget_set_sensitive(win->menu.insert_link, (conv->features & PURPLE_CONNECTION_HTML)); - gtk_widget_set_sensitive(win->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE) && !(conv->features & PURPLE_CONNECTION_NO_IMAGES)); + gtk_widget_set_sensitive(win->menu.insert_image, !(conv->features & PURPLE_CONNECTION_NO_IMAGES)); if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {