Rework rendering of raw XML as source

We need to be stricter with what counts as raw XML, for instance
not SVG images. And we shouldn't break explicit source view.
This commit is contained in:
Christian Dywan 2010-05-07 20:31:41 +02:00
parent fb72bcfeae
commit 743b264a72

View file

@ -2594,15 +2594,12 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type))
{ {
#if WEBKIT_CHECK_VERSION (1, 1, 14) #if WEBKIT_CHECK_VERSION (1, 1, 14)
gboolean view_source = FALSE; gboolean view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view));
if (strcmp (mime_type, "application/xhtml+xml")) /* Render raw XML, including news feeds, as source */
{ if (!view_source && (!strcmp (mime_type, "application/xml")
content_type = g_content_type_from_mime_type (mime_type); || !strcmp (mime_type, "text/xml")))
if (g_content_type_is_a (content_type, "application/xml"))
view_source = TRUE; view_source = TRUE;
g_free (content_type);
}
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source); webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source);
#endif #endif