[empathy] New webkit needs an URI as basedir for webkit_web_view_load_html_string.

[Xavier Claessens <xclaesse src gnome org>]

commit b722fcccf60be70a068b83b9e7f49fcbc6fde4e4
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Jun 11 17:44:56 2009 +0200

    New webkit needs an URI as basedir for webkit_web_view_load_html_string.

 configure.ac                         |    3 ++-
 libempathy-gtk/empathy-theme-adium.c |   10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c9527a0..5fa9f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ LIBCHAMPLAIN_REQUIRED=0.3.0
 LIBCHAMPLAIN_GTK_REQUIRED=0.3.0
 CLUTTER_GTK_REQUIRED=0.8.2
 GEOCLUE_REQUIRED=0.11
+WEBKIT_REQUIRED=1.1.7
 
 # Use --enable-maintainer-mode to disabled deprecated symbols
 GNOME_MAINTAINER_MODE_DEFINES
@@ -166,7 +167,7 @@ AC_ARG_ENABLE(webkit,
 if test "x$enable_webkit" != "xno"; then
    PKG_CHECK_MODULES(WEBKIT, 
    [
-      webkit-1.0
+      webkit-1.0 >= $WEBKIT_REQUIRED
    ], have_webkit="yes", have_webkit="no")
 
    if test "x$have_webkit" = "xyes"; then
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 6448b24..c838800 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -84,8 +84,10 @@ theme_adium_load (EmpathyThemeAdium *theme)
 	gchar                 *css_path;
 	guint                  len = 0;
 	guint                  i = 0;
+	gchar                 *basedir_uri;
 
 	priv->basedir = g_strconcat (priv->path, G_DIR_SEPARATOR_S "Contents" G_DIR_SEPARATOR_S "Resources" G_DIR_SEPARATOR_S, NULL);
+	basedir_uri = g_strconcat ("file://", priv->basedir, NULL);
 
 	/* Load html files */
 	file = g_build_filename (priv->basedir, "Incoming", "Content.html", NULL);
@@ -156,8 +158,9 @@ theme_adium_load (EmpathyThemeAdium *theme)
 
 	/* Load the template */
 	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (theme),
-					  priv->template_html, priv->basedir);
+					  priv->template_html, basedir_uri);
 
+	g_free (basedir_uri);
 	g_free (template_html);
 	g_free (css_path);
 	g_strfreev (strv);
@@ -575,10 +578,13 @@ static void
 theme_adium_clear (EmpathyChatView *view)
 {
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (view);
+	gchar *basedir_uri;
 
 	priv->page_loaded = FALSE;
+	basedir_uri = g_strconcat ("file://", priv->basedir, NULL);
 	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (view),
-					  priv->template_html, priv->basedir);
+					  priv->template_html, basedir_uri);
+	g_free (basedir_uri);
 }
 
 static gboolean