diff -r 363082ee4eec -r 72824d3b7190 pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c	Sun Sep 18 20:00:43 2016 -0500
+++ b/pidgin/gtkwebviewtoolbar.c	Sun Sep 18 20:16:43 2016 -0500
@@ -562,7 +562,7 @@
 	if (filename == NULL)
 		return;
 
-	img = purple_image_new_from_file(filename);
+	img = purple_image_new_from_file(filename, NULL);
 
 	if (!img) {
 		gchar *buf = g_strdup_printf(_("Failed to store image: %s"),
@@ -633,15 +633,13 @@
 insert_smiley_text(GtkWidget *widget, PidginWebViewToolbar *toolbar)
 {
 	PurpleSmiley *smiley;
-	PurpleImage *image;
 	guint image_id;
 	gchar *escaped_smiley, *smiley_html;
 	const gchar *smiley_class;
 
 	smiley = g_object_get_data(G_OBJECT(widget), "smiley");
 	smiley_class = g_object_get_data(G_OBJECT(widget), "smiley-class");
-	image = purple_smiley_get_image(smiley);
-	image_id = purple_image_store_add(image);
+	image_id = purple_image_store_add(PURPLE_IMAGE(smiley));
 
 	escaped_smiley = g_markup_escape_text(
 		purple_smiley_get_shortcut(smiley), -1);
@@ -694,8 +692,7 @@
 			continue;
 		}
 
-		pixbuf = pidgin_pixbuf_from_image(
-			purple_smiley_get_image(smiley));
+		pixbuf = pidgin_pixbuf_from_image(PURPLE_IMAGE(smiley));
 		pixbuf = pidgin_pixbuf_scale_down(pixbuf,
 			24, 24, GDK_INTERP_BILINEAR, TRUE);