aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-06-11 23:44:56 +0800
committerXavier Claessens <xclaesse@gmail.com>2009-06-12 01:17:33 +0800
commitb722fcccf60be70a068b83b9e7f49fcbc6fde4e4 (patch)
tree6effedc50303f271e0f16c8b0dd814f101edb017 /libempathy-gtk
parent823b8bf90abf4230a63bb00fef7e9ffd7cd11156 (diff)
downloadgsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar.gz
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar.bz2
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar.lz
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar.xz
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.tar.zst
gsoc2013-empathy-b722fcccf60be70a068b83b9e7f49fcbc6fde4e4.zip
New webkit needs an URI as basedir for webkit_web_view_load_html_string.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-theme-adium.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 6448b242b..c838800c1 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