diff pidgin/gtkwebview.c @ 32563:e63ca20258fb

Having a backcolor and a background seems a bit redundant. And we just set one to the other anyway. Might as well keep things simple.

--- a/pidgin/gtkwebview.c	Mon Feb 27 06:35:27 2012 +0000
+++ b/pidgin/gtkwebview.c	Mon Feb 27 06:41:57 2012 +0000
@@ -68,7 +68,6 @@
 	GtkWebViewButtons format_functions;
 	struct {
 		gboolean wbfo:1;	/* Whole buffer formatting only. */
-		gchar *background;
 	} edit;
 
 } GtkWebViewPriv;
@@ -304,15 +303,11 @@
 static void
 webview_clear_formatting(GtkWebView *webview)
 {
-	GtkWebViewPriv *priv = GTK_WEBVIEW_GET_PRIVATE(webview);
 	WebKitDOMDocument *dom;
 
 	if (!webkit_web_view_get_editable(WEBKIT_WEB_VIEW(webview)))
 		return;
 
-	g_free(priv->edit.background);
-	priv->edit.background = NULL;
-
 	dom = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(webview));
 	webkit_dom_document_exec_command(dom, "removeFormat", FALSE, "");
 }
@@ -709,7 +704,7 @@
 		} else
 			strcpy(color, "");
 
-		gtk_webview_toggle_background(webview, color);
+		gtk_webview_toggle_backcolor(webview, color);
 
 		if (flags & PURPLE_CONNECTION_FORMATTING_WBFO)
 			gtk_webview_set_whole_buffer_formatting_only(webview, TRUE);
@@ -797,13 +792,6 @@
 	return webkit_dom_document_query_command_value(dom, "backColor");
 }
 
-char *
-gtk_webview_get_current_background(GtkWebView *webview)
-{
-	GtkWebViewPriv *priv = GTK_WEBVIEW_GET_PRIVATE(webview);
-	return g_strdup(priv->edit.background);
-}
-
 gint
 gtk_webview_get_current_fontsize(GtkWebView *webview)
 {
@@ -897,17 +885,6 @@
 }
 
 gboolean
-gtk_webview_toggle_background(GtkWebView *webview, const char *color)
-{
-	GtkWebViewPriv *priv = GTK_WEBVIEW_GET_PRIVATE(webview);
-
-	g_free(priv->edit.background);
-	priv->edit.background = g_strdup(color);
-
-	return FALSE;
-}
-
-gboolean
 gtk_webview_toggle_fontface(GtkWebView *webview, const char *face)
 {
 	WebKitDOMDocument *dom;