/pidgin/main: d598e7950c34: imgstore has no more refs, drop it
Tomasz Wasilczyk
twasilczyk at pidgin.im
Fri Apr 11 19:29:32 EDT 2014
Changeset: d598e7950c34290e4ba55d5c6291dcd3fe6dee37
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-04-12 01:29 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/d598e7950c34
Description:
imgstore has no more refs, drop it
diffstat:
doc/reference/libpurple/Makefile.am | 1 -
doc/reference/libpurple/libpurple-docs.xml | 2 -
libpurple/Makefile.am | 2 -
libpurple/Makefile.mingw | 1 -
libpurple/imgstore.c | 124 -----------------------------
libpurple/imgstore.h | 72 ----------------
libpurple/purple.h.in | 1 -
po/POTFILES.skip | 1 -
8 files changed, 0 insertions(+), 204 deletions(-)
diffs (288 lines):
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -94,7 +94,6 @@ content_files = version.xml \
signals_conversation.xml \
signals_core.xml \
signals_dbus_server.xml \
- signals_imgstore.xml \
signals_jabber.xml \
signals_log.xml \
signals_notify.xml \
diff --git a/doc/reference/libpurple/libpurple-docs.xml b/doc/reference/libpurple/libpurple-docs.xml
--- a/doc/reference/libpurple/libpurple-docs.xml
+++ b/doc/reference/libpurple/libpurple-docs.xml
@@ -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>
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -73,7 +73,6 @@ purple_coresources = \
idle.c \
image.c \
image-store.c \
- imgstore.c \
keyring.c \
log.c \
media/backend-fs2.c \
@@ -159,7 +158,6 @@ purple_coreheaders = \
idle.h \
image.h \
image-store.h \
- imgstore.h \
keyring.h \
log.h \
media.h \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -97,7 +97,6 @@ C_SRC = \
idle.c \
image.c \
image-store.c \
- imgstore.c \
keyring.c \
log.c \
media/candidate.c \
diff --git a/libpurple/imgstore.c b/libpurple/imgstore.c
deleted file mode 100644
--- a/libpurple/imgstore.c
+++ /dev/null
@@ -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;
-}
diff --git a/libpurple/imgstore.h b/libpurple/imgstore.h
deleted file mode 100644
--- a/libpurple/imgstore.h
+++ /dev/null
@@ -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_ */
diff --git a/libpurple/purple.h.in b/libpurple/purple.h.in
--- a/libpurple/purple.h.in
+++ b/libpurple/purple.h.in
@@ -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>
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -11,7 +11,6 @@ libpurple/plugins/perl/common/Core.c
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
More information about the Commits
mailing list