Mercurial > pidgin.yaz
diff pidgin/gtkimhtml.c @ 27666:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 12 Jul 2009 05:43:38 +0000 |
| parents | 73c8e1964eef |
| children | f058edca3d66 deecc1d663c4 |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Sun Jul 12 05:42:40 2009 +0000 +++ b/pidgin/gtkimhtml.c Sun Jul 12 05:43:38 2009 +0000 @@ -1549,7 +1549,7 @@ GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-visited-color", _("Hyperlink visited color"), - _("Color to draw hyperlinks after it has been visited (or activated)."), + _("Color to draw hyperlink after it has been visited (or activated)."), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-prelight-color", _("Hyperlink prelight color"), @@ -1573,11 +1573,11 @@ GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-action-name-color", _("Action Message Name Color for Whispered Message"), - _("Color to draw the name of an action message."), + _("Color to draw the name of a whispered action message."), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-name-color", _("Whisper Message Name Color"), - _("Color to draw the name of an action message."), + _("Color to draw the name of a whispered message."), GDK_TYPE_COLOR, G_PARAM_READABLE)); /* Customizable typing notification ... sort of. Example: @@ -1587,7 +1587,7 @@ */ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("typing-notification-color", _("Typing notification color"), - _("The color to use for the typing notification font"), + _("The color to use for the typing notification"), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_string("typing-notification-font", _("Typing notification font"), @@ -2996,10 +2996,21 @@ break; id = gtk_imhtml_get_html_opt(tag, "ID="); - if (!id) - break; - gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter); - g_free(id); + if (id) { + gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter); + g_free(id); + } else { + char *src, *alt; + src = gtk_imhtml_get_html_opt(tag, "SRC="); + alt = gtk_imhtml_get_html_opt(tag, "ALT="); + if (src) { + gtk_imhtml_toggle_link(imhtml, src); + gtk_text_buffer_insert(imhtml->text_buffer, iter, alt ? alt : src, -1); + gtk_imhtml_toggle_link(imhtml, NULL); + } + g_free (src); + g_free (alt); + } break; } case 47: /* P (opt) */