pidgin: ded88599: Don't attempt to add smileys to a webvie...

qulogic at pidgin.im qulogic at pidgin.im
Sun Sep 11 00:57:47 EDT 2011


----------------------------------------------------------------------
Revision: ded885990211d68baf28ce334d029d8c55bbb3f3
Parent:   24c496b1d64c2b04a0ed62162f1e1a83ace867c2
Author:   qulogic at pidgin.im
Date:     09/11/11 00:50:52
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ded885990211d68baf28ce334d029d8c55bbb3f3

Changelog: 

Don't attempt to add smileys to a webview by treating it as imhtml.

Changes against parent 24c496b1d64c2b04a0ed62162f1e1a83ace867c2

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	810313db88a910f426132633698ed2b7af3390cd
+++ pidgin/gtkconv.c	3c53270bb75beb8f405ec03855cadea9c72dbdbd
@@ -6308,6 +6308,13 @@ static gboolean
 }
 
 static gboolean
+add_custom_smiley_for_webview(GtkWebView *webview, const char *sml, const char *smile)
+{
+	/* FIXME: Smileys need to be added to webkit stuff */
+	return TRUE;
+}
+
+static gboolean
 pidgin_conv_custom_smiley_add(PurpleConversation *conv, const char *smile, gboolean remote)
 {
 	PidginConversation *gtkconv;
@@ -6334,7 +6341,7 @@ pidgin_conv_custom_smiley_add(PurpleConv
 		}
 	}
 
-	if (!add_custom_smiley_for_imhtml(GTK_IMHTML(gtkconv->webview), sml, smile))
+	if (!add_custom_smiley_for_webview(GTK_WEBVIEW(gtkconv->webview), sml, smile))
 		return FALSE;
 
 	if (!remote)	/* If it's a local custom smiley, then add it for the entry */


More information about the Commits mailing list