Mercurial > pidgin3 / changeset

--- a/doc/reference/libpurple/Makefile.am	Sat Apr 12 01:21:59 2014 +0200
+++ b/doc/reference/libpurple/Makefile.am	Sat Apr 12 01:29:23 2014 +0200
@@ -94,7 +94,6 @@
 	signals_conversation.xml \
 	signals_core.xml \
 	signals_dbus_server.xml \
-	signals_imgstore.xml \
 	signals_jabber.xml \
 	signals_log.xml \
 	signals_notify.xml \

--- a/doc/reference/libpurple/libpurple-docs.xml	Sat Apr 12 01:21:59 2014 +0200
+++ b/doc/reference/libpurple/libpurple-docs.xml	Sat Apr 12 01:29:23 2014 +0200
@@ -53,7 +53,6 @@
       <xi:include href="xml/purple-socket.xml" />
       <xi:include href="xml/http.xml" />
       <xi:include href="xml/idle.xml" />
-      <xi:include href="xml/imgstore.xml" />
       <xi:include href="xml/keyring.xml" />
       <xi:include href="xml/log.xml" />
       <xi:include href="xml/memorypool.xml" />
@@ -163,7 +162,6 @@
       <xi:include href="signals_plugin.xml" />
       <xi:include href="signals_savedstatus.xml" />
       <xi:include href="signals_sound.xml" />
-      <xi:include href="signals_imgstore.xml" />
       <xi:include href="signals_jabber.xml" />
   </reference>
 

--- a/libpurple/Makefile.am	Sat Apr 12 01:21:59 2014 +0200
+++ b/libpurple/Makefile.am	Sat Apr 12 01:29:23 2014 +0200
@@ -73,7 +73,6 @@
 	idle.c \
 	image.c \
 	image-store.c \
-	imgstore.c \
 	keyring.c \
 	log.c \
 	media/backend-fs2.c \
@@ -159,7 +158,6 @@
 	idle.h \
 	image.h \
 	image-store.h \
-	imgstore.h \
 	keyring.h \
 	log.h \
 	media.h \

--- a/libpurple/Makefile.mingw	Sat Apr 12 01:21:59 2014 +0200
+++ b/libpurple/Makefile.mingw	Sat Apr 12 01:29:23 2014 +0200
@@ -97,7 +97,6 @@
 			idle.c \
 			image.c \
 			image-store.c \
-			imgstore.c \
 			keyring.c \
 			log.c \
 			media/candidate.c \

--- a/libpurple/imgstore.c	Sat Apr 12 01:21:59 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- *
-*/
-
-#include "internal.h"
-
-#include "dbus-maybe.h"
-#include "debug.h"
-#include "imgstore.h"
-#include "util.h"
-
-PurpleStoredImage *
-purple_imgstore_new(gpointer data, size_t size, const char *filename)
-{
-	return purple_image_new_from_data(data, size);
-}
-
-PurpleStoredImage *
-purple_imgstore_new_from_file(const char *path)
-{
-	return purple_image_new_from_file(path, TRUE);
-}
-
-int
-purple_imgstore_new_with_id(gpointer data, size_t size, const char *filename)
-{
-	PurpleImage *image = purple_image_new_from_data(data, size);
-
-	return purple_image_store_add(image);
-}
-
-int
-purple_imgstore_add_with_id(PurpleStoredImage *image)
-{
-	return purple_image_store_add(image);
-}
-
-PurpleStoredImage *purple_imgstore_find_by_id(int id)
-{
-	return purple_image_store_get(id);
-}
-
-gconstpointer purple_imgstore_get_data(PurpleStoredImage *img)
-{
-	return purple_image_get_data(img);
-}
-
-size_t purple_imgstore_get_size(PurpleStoredImage *img)
-{
-	return purple_image_get_size(img);
-}
-
-const char *purple_imgstore_get_filename(const PurpleStoredImage *img)
-{
-	return purple_image_get_path((PurpleImage *)img);
-}
-
-const char *purple_imgstore_get_extension(PurpleStoredImage *img)
-{
-	return purple_image_get_extension(img);
-}
-
-void purple_imgstore_ref_by_id(int id)
-{
-	PurpleImage *img = purple_image_store_get(id);
-
-	g_return_if_fail(img != NULL);
-
-	g_object_ref(img);
-}
-
-void purple_imgstore_unref_by_id(int id)
-{
-	PurpleImage *img = purple_image_store_get(id);
-
-	g_return_if_fail(img != NULL);
-
-	g_object_unref(img);
-}
-
-PurpleStoredImage *
-purple_imgstore_ref(PurpleStoredImage *img)
-{
-	g_object_ref(img);
-
-	return img;
-}
-
-void
-purple_imgstore_unref(PurpleStoredImage *img)
-{
-	if (img == NULL) {
-		purple_debug_warning("imgstore",
-			"purple_imgstore_unref: img empty");
-		return;
-	}
-	g_object_unref(img);
-}
-
-void *
-purple_imgstore_get_handle()
-{
-	static int handle;
-
-	return &handle;
-}

--- a/libpurple/imgstore.h	Sat Apr 12 01:21:59 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#ifndef _PURPLE_IMGSTORE_H_
-#define _PURPLE_IMGSTORE_H_
-
-/* XXX: this file is in progress of deleting */
-
-#include "image.h"
-#include "image-store.h"
-
-#define PURPLE_STORED_IMAGE_PROTOCOL PURPLE_IMAGE_STORE_PROTOCOL
-#define PURPLE_STOCK_IMAGE_PROTOCOL PURPLE_IMAGE_STORE_STOCK_PROTOCOL
-
-typedef struct _PurpleImage PurpleStoredImage;
-
-#define PURPLE_TYPE_STORED_IMAGE PURPLE_TYPE_IMAGE
-
-#define PURPLE_IS_STORED_IMAGE(image) PURPLE_IS_IMAGE(image)
-
-PurpleStoredImage *
-purple_imgstore_new(gpointer data, size_t size, const char *filename);
-
-PurpleStoredImage *
-purple_imgstore_new_from_file(const char *path);
-
-int purple_imgstore_new_with_id(gpointer data, size_t size, const char *filename);
-
-int
-purple_imgstore_add_with_id(PurpleStoredImage *image);
-
-PurpleStoredImage *purple_imgstore_find_by_id(int id);
-
-gconstpointer purple_imgstore_get_data(PurpleStoredImage *img);
-
-size_t purple_imgstore_get_size(PurpleStoredImage *img);
-
-const char *purple_imgstore_get_filename(const PurpleStoredImage *img);
-
-const char *purple_imgstore_get_extension(PurpleStoredImage *img);
-
-PurpleStoredImage *
-purple_imgstore_ref(PurpleStoredImage *img);
-
-void
-purple_imgstore_unref(PurpleStoredImage *img);
-
-void purple_imgstore_ref_by_id(int id);
-
-void purple_imgstore_unref_by_id(int id);
-
-void *purple_imgstore_get_handle(void);
-
-#endif /* _PURPLE_IMGSTORE_H_ */

--- a/libpurple/purple.h.in	Sat Apr 12 01:21:59 2014 +0200
+++ b/libpurple/purple.h.in	Sat Apr 12 01:29:23 2014 +0200
@@ -67,7 +67,6 @@
 #include <enums.h>
 #include <eventloop.h>
 #include <idle.h>
-#include <imgstore.h>
 #include <log.h>
 #include <media.h>
 #include <mediamanager.h>

--- a/po/POTFILES.skip	Sat Apr 12 01:21:59 2014 +0200
+++ b/po/POTFILES.skip	Sat Apr 12 01:29:23 2014 +0200
@@ -11,7 +11,6 @@
 libpurple/plugins/perl/common/Debug.c
 libpurple/plugins/perl/common/FT.c
 libpurple/plugins/perl/common/Idle.c
-libpurple/plugins/perl/common/ImgStore.c
 libpurple/plugins/perl/common/Log.c
 libpurple/plugins/perl/common/Network.c
 libpurple/plugins/perl/common/Notify.c