← Back to branch summary

~ubuntu-branches/ubuntu/maverick/liferea/maverick

« back to all changes in this revision

Viewing changes to src/webkit/webkit.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2009-03-10 23:47:50 UTC
  • mfrom: (1.2.55 upstream)
  • Revision ID: james.westby@ubuntu.com-20090310234750-lnvjgb81gggwyyd4
Tags: 1.4.26-0ubuntu1
https://launchpad.net/bugs/325750
https://launchpad.net/bugs/328606
* New upstream bugfix release (lp: #325750).
  - debian/patches/90_autoreconf: refreshed.
* debian/patches/notification_check_for_actions_support:
  - New patch backported from upstream r4468, check for actions support
    in notifications before using them (lp: #328606).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/webkit/webkit.c
67
67
                g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
68
68
                ? "application/xhtml"
69
69
                : content_type;
70
 
        webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string, content_type, "UTF-8", base);
 
70
                
 
71
#if WEBKIT_MINOR_VERSION > 0
 
72
        webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (htmlwidget), string, "file://");
 
73
#else
 
74
        webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string, content_type, "UTF-8", "file://");
 
75
#endif
71
76
}
72
77
 
73
78
static void