/pidgin/main: f86e09b6ed33: Small imgstore cleanup

[Tomasz Wasilczyk]

Changeset: f86e09b6ed33e666203431f11a2f9197453606de
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-10 22:28 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/f86e09b6ed33

Description:

Small imgstore cleanup

diffstat:

 libpurple/conversation.c                   |  1 -
 libpurple/core.c                           |  2 +-
 libpurple/plugins/perl/common/BuddyIcon.xs |  2 +-
 libpurple/prpl.h                           |  6 +++---
 libpurple/theme.h                          |  1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

diffs (70 lines):

diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -28,7 +28,6 @@
 #include "dbus-maybe.h"
 #include "debug.h"
 #include "enums.h"
-#include "imgstore.h"
 #include "notify.h"
 #include "prefs.h"
 #include "prpl.h"
diff --git a/libpurple/core.c b/libpurple/core.c
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -177,7 +177,7 @@ purple_core_init(const char *ui)
 	purple_keyring_init(); /* before accounts */
 	purple_theme_manager_init();
 
-	/* The buddy icon code uses the imgstore, so init it early. */
+	/* The buddy icon code uses the image store, so init it early. */
 	_purple_image_store_init();
 
 	/* Accounts use status, buddy icons and connection signals, so
diff --git a/libpurple/plugins/perl/common/BuddyIcon.xs b/libpurple/plugins/perl/common/BuddyIcon.xs
--- a/libpurple/plugins/perl/common/BuddyIcon.xs
+++ b/libpurple/plugins/perl/common/BuddyIcon.xs
@@ -45,7 +45,7 @@ purple_buddy_icon_get_scale_size(spec, w
 	int *width
 	int *height
 
-gchar_own *
+const gchar *
 purple_buddy_icon_get_full_path(icon);
 	Purple::Buddy::Icon icon
 
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -82,7 +82,7 @@ typedef struct _PurpleThumbnailSpec Purp
 #include "buddylist.h"
 #include "conversations.h"
 #include "xfer.h"
-#include "imgstore.h"
+#include "image.h"
 #include "media.h"
 #include "notify.h"
 #include "proxy.h"
@@ -492,9 +492,9 @@ struct _PurplePluginProtocolInfo
 	/*
 	 * Set the buddy icon for the given connection to @img.  The prpl
 	 * does NOT own a reference to @img; if it needs one, it must
-	 * #purple_imgstore_ref(@img) itself.
+	 * #g_object_ref(@img) itself.
 	 */
-	void (*set_buddy_icon)(PurpleConnection *, PurpleStoredImage *img);
+	void (*set_buddy_icon)(PurpleConnection *, PurpleImage *img);
 
 	void (*remove_group)(PurpleConnection *gc, PurpleGroup *group);
 
diff --git a/libpurple/theme.h b/libpurple/theme.h
--- a/libpurple/theme.h
+++ b/libpurple/theme.h
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "imgstore.h"
 
 typedef struct _PurpleTheme        PurpleTheme;
 typedef struct _PurpleThemeClass   PurpleThemeClass;