diff -r 832cd077145e -r 07746c9a04bf pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Mon Apr 07 20:02:22 2014 +0530
+++ b/pidgin/gtkutils.c	Fri Apr 11 16:23:12 2014 +0530
@@ -42,7 +42,6 @@
 #include "conversation.h"
 #include "debug.h"
 #include "desktopitem.h"
-#include "imgstore.h"
 #include "notify.h"
 #include "prefs.h"
 #include "protocol.h"
@@ -1398,9 +1397,10 @@
 	GError *err = NULL;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	int id;
 	PurpleBuddy *buddy;
 	PurpleContact *contact;
+	PurpleImage *img;
+
 	switch (choice) {
 	case DND_BUDDY_ICON:
 		if (g_stat(data->filename, &st)) {
@@ -1445,10 +1445,10 @@
 		}
 		shortname = strrchr(data->filename, G_DIR_SEPARATOR);
 		shortname = shortname ? shortname + 1 : data->filename;
-		id = purple_imgstore_new_with_id(filedata, size, shortname);
-
-		pidgin_webview_insert_image(PIDGIN_WEBVIEW(gtkconv->entry), id);
-		purple_imgstore_unref_by_id(id);
+		img = purple_image_new_from_data(filedata, size);
+
+		pidgin_webview_insert_image(PIDGIN_WEBVIEW(gtkconv->entry), img);
+		g_object_unref(img);
 
 		break;
 	}
@@ -3083,10 +3083,11 @@
 	return GDK_PIXBUF_ANIMATION(pidgin_pixbuf_from_data_helper(buf, count, TRUE));
 }
 
-GdkPixbuf *pidgin_pixbuf_from_imgstore(PurpleStoredImage *image)
+GdkPixbuf *
+pidgin_pixbuf_from_image(PurpleImage *image)
 {
-	return pidgin_pixbuf_from_data(purple_imgstore_get_data(image),
-			purple_imgstore_get_size(image));
+	return pidgin_pixbuf_from_data(purple_image_get_data(image),
+		purple_image_get_size(image));
 }
 
 GdkPixbuf *pidgin_pixbuf_new_from_file(const gchar *filename)