pidgin: 0999ca4d: Remove _with_imgstore suffix on this fun...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 0999ca4d27c29a236181f63c3e351073fbf9911a
Parent:   ccfb262bb9e313a5281f05015530ef94fc58a573
Author:   qulogic at pidgin.im
Date:     05/30/12 20:36:55
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0999ca4d27c29a236181f63c3e351073fbf9911a

Changelog: 

Remove _with_imgstore suffix on this function. There isn't a version
without it anyway.

Changes against parent ccfb262bb9e313a5281f05015530ef94fc58a573

  patched  pidgin/gtknotify.c
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h

-------------- next part --------------
============================================================
--- pidgin/gtknotify.c	b7e888ce5803fb36a468b59e341f173239edefae
+++ pidgin/gtknotify.c	59ddcfb4afe46708f724c0e5d655cbf5314a1e7a
@@ -891,7 +891,7 @@ pidgin_notify_formatted(const char *titl
 
 	/* 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 @@ pidgin_notify_userinfo(PurpleConnection 
 	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;
============================================================
--- pidgin/gtkwebview.c	bf3525f916109ddc24d3b1cb08b929a3b2cab878
+++ pidgin/gtkwebview.c	9bdd9018d3db3ef1d0db18aaa23bcbe11fefbfc0
@@ -526,7 +526,7 @@ void
 }
 
 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;
============================================================
--- pidgin/gtkwebview.h	557e200272afcb0f7f462e66dca7165d3242a130
+++ pidgin/gtkwebview.h	6bb63249a6b732e32d65db66928dca4808e811ea
@@ -120,7 +120,7 @@ void gtk_webview_append_html(GtkWebView 
  * @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