--- a/libpurple/protocols/msn/object.h Fri Apr 11 12:28:23 2014 +0200 +++ b/libpurple/protocols/msn/object.h Fri Apr 11 20:08:22 2014 +0200 @@ -36,8 +36,6 @@ #include "internal.h" -#include "imgstore.h" - typedef struct { gboolean local; @@ -45,7 +43,7 @@ char *creator; int size; MsnObjectType type; - PurpleStoredImage *img; + PurpleImage *img; char *location; char *friendly; char *sha1d; @@ -80,7 +78,7 @@ * * @return A new MsnObject structure */ -MsnObject *msn_object_new_from_image(PurpleStoredImage *img, +MsnObject *msn_object_new_from_image(PurpleImage *img, const char *location, const char *creator, MsnObjectType type); /** @@ -155,7 +153,7 @@ * @param obj The object. * @param img The image to associate. */ -void msn_object_set_image(MsnObject *obj, PurpleStoredImage *img); +void msn_object_set_image(MsnObject *obj, PurpleImage *img); /** * Sets the url field in a MsnObject. @@ -250,7 +248,7 @@ * * @return The associated image. */ -PurpleStoredImage *msn_object_get_image(const MsnObject *obj); +PurpleImage *msn_object_get_image(const MsnObject *obj); /** * Returns a MsnObject's url value.