Mercurial > pidgin3 / changeset

--- a/pidgin/gtknotify.c	Mon May 28 22:34:59 2012 +0000
+++ b/pidgin/gtknotify.c	Thu May 31 00:36:55 2012 +0000
@@ -891,7 +891,7 @@
 
 	/* Make sure URLs are clickable */
 	linked_text = purple_markup_linkify(text);
-	webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(web_view), linked_text, "");
+	gtk_webview_load_html_string(GTK_WEBVIEW(web_view), linked_text);
 	g_free(linked_text);
 
 	g_object_set_data(G_OBJECT(window), "webview-widget", web_view);
@@ -1151,7 +1151,7 @@
 	if (pinfo != NULL) {
 		GtkWidget *webview = g_object_get_data(G_OBJECT(pinfo->window), "webview-widget");
 		char *linked_text = purple_markup_linkify(info);
-		gtk_webview_load_html_string_with_imgstore(GTK_WEBVIEW(webview), linked_text);
+		gtk_webview_load_html_string(GTK_WEBVIEW(webview), linked_text);
 		g_free(linked_text);
 		g_free(key);
 		ui_handle = pinfo->window;

--- a/pidgin/gtkwebview.c	Mon May 28 22:34:59 2012 +0000
+++ b/pidgin/gtkwebview.c	Thu May 31 00:36:55 2012 +0000
@@ -526,7 +526,7 @@
 }
 
 void
-gtk_webview_load_html_string_with_imgstore(GtkWebView *webview, const char *html)
+gtk_webview_load_html_string(GtkWebView *webview, const char *html)
 {
 	GtkWebViewPriv *priv = GTK_WEBVIEW_GET_PRIVATE(webview);
 	char *html_imged;

--- a/pidgin/gtkwebview.h	Mon May 28 22:34:59 2012 +0000
+++ b/pidgin/gtkwebview.h	Thu May 31 00:36:55 2012 +0000
@@ -120,7 +120,7 @@
  * @param webview The GtkWebView object
  * @param html    The HTML content to load
  */
-void gtk_webview_load_html_string_with_imgstore(GtkWebView *webview, const char *html);
+void gtk_webview_load_html_string(GtkWebView *webview, const char *html);
 
 /**
  * Execute the JavaScript only after the webkit_webview_load_string