Move the pidgin_pixbuf stuff to pidgingdkpixbuf.[ch]

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1100/

1 files changed, 1 insertions, 188 deletions

diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 4be1f77e71..be8338734d 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -47,6 +47,7 @@
 #include "gtkutils.h"
 #include "minidialog.h"
 #include "pidgincore.h"
+#include "pidgingdkpixbuf.h"
 
 /******************************************************************************
  * Enums
@@ -1941,194 +1942,6 @@ gboolean pidgin_auto_parent_window(GtkWidget *widget)
 #endif
 }
 
-static GObject *pidgin_pixbuf_from_data_helper(const guchar *buf, gsize count, gboolean animated)
-{
-	GObject *pixbuf;
-	GdkPixbufLoader *loader;
-	GError *error = NULL;
-
-	loader = gdk_pixbuf_loader_new();
-
-	if (!gdk_pixbuf_loader_write(loader, buf, count, &error) || error) {
-		purple_debug_warning("gtkutils", "gdk_pixbuf_loader_write() "
-				"failed with size=%" G_GSIZE_FORMAT ": %s\n", count,
-				error ? error->message : "(no error message)");
-		if (error)
-			g_error_free(error);
-		g_object_unref(G_OBJECT(loader));
-		return NULL;
-	}
-
-	if (!gdk_pixbuf_loader_close(loader, &error) || error) {
-		purple_debug_warning("gtkutils", "gdk_pixbuf_loader_close() "
-				"failed for image of size %" G_GSIZE_FORMAT ": %s\n", count,
-				error ? error->message : "(no error message)");
-		if (error)
-			g_error_free(error);
-		g_object_unref(G_OBJECT(loader));
-		return NULL;
-	}
-
-	if (animated)
-		pixbuf = G_OBJECT(gdk_pixbuf_loader_get_animation(loader));
-	else
-		pixbuf = G_OBJECT(gdk_pixbuf_loader_get_pixbuf(loader));
-	if (!pixbuf) {
-		purple_debug_warning("gtkutils", "%s() returned NULL for image "
-				"of size %" G_GSIZE_FORMAT "\n",
-				animated ? "gdk_pixbuf_loader_get_animation"
-					: "gdk_pixbuf_loader_get_pixbuf", count);
-		g_object_unref(G_OBJECT(loader));
-		return NULL;
-	}
-
-	g_object_ref(pixbuf);
-	g_object_unref(G_OBJECT(loader));
-
-	return pixbuf;
-}
-
-GdkPixbuf *pidgin_pixbuf_from_data(const guchar *buf, gsize count)
-{
-	return GDK_PIXBUF(pidgin_pixbuf_from_data_helper(buf, count, FALSE));
-}
-
-GdkPixbufAnimation *pidgin_pixbuf_anim_from_data(const guchar *buf, gsize count)
-{
-	return GDK_PIXBUF_ANIMATION(pidgin_pixbuf_from_data_helper(buf, count, TRUE));
-}
-
-GdkPixbuf *
-pidgin_pixbuf_from_image(PurpleImage *image)
-{
-	return pidgin_pixbuf_from_data(purple_image_get_data(image),
-		purple_image_get_data_size(image));
-}
-
-GdkPixbuf *pidgin_pixbuf_new_from_file(const gchar *filename)
-{
-	GdkPixbuf *pixbuf;
-	GError *error = NULL;
-
-	g_return_val_if_fail(filename != NULL, NULL);
-	g_return_val_if_fail(filename[0] != '\0', NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file(filename, &error);
-	if (!pixbuf || error) {
-		purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file() "
-				"returned %s for file %s: %s\n",
-				pixbuf ? "something" : "nothing",
-				filename,
-				error ? error->message : "(no error message)");
-		if (error)
-			g_error_free(error);
-		if (pixbuf)
-			g_object_unref(G_OBJECT(pixbuf));
-		return NULL;
-	}
-
-	return pixbuf;
-}
-
-GdkPixbuf *pidgin_pixbuf_new_from_file_at_size(const char *filename, int width, int height)
-{
-	GdkPixbuf *pixbuf;
-	GError *error = NULL;
-
-	g_return_val_if_fail(filename != NULL, NULL);
-	g_return_val_if_fail(filename[0] != '\0', NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file_at_size(filename,
-			width, height, &error);
-	if (!pixbuf || error) {
-		purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_size() "
-				"returned %s for file %s: %s\n",
-				pixbuf ? "something" : "nothing",
-				filename,
-				error ? error->message : "(no error message)");
-		if (error)
-			g_error_free(error);
-		if (pixbuf)
-			g_object_unref(G_OBJECT(pixbuf));
-		return NULL;
-	}
-
-	return pixbuf;
-}
-
-GdkPixbuf *pidgin_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, gboolean preserve_aspect_ratio)
-{
-	GdkPixbuf *pixbuf;
-	GError *error = NULL;
-
-	g_return_val_if_fail(filename != NULL, NULL);
-	g_return_val_if_fail(filename[0] != '\0', NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file_at_scale(filename,
-			width, height, preserve_aspect_ratio, &error);
-	if (!pixbuf || error) {
-		purple_debug_warning("gtkutils", "gdk_pixbuf_new_from_file_at_scale() "
-				"returned %s for file %s: %s\n",
-				pixbuf ? "something" : "nothing",
-				filename,
-				error ? error->message : "(no error message)");
-		if (error)
-			g_error_free(error);
-		if (pixbuf)
-			g_object_unref(G_OBJECT(pixbuf));
-		return NULL;
-	}
-
-	return pixbuf;
-}
-
-GdkPixbuf *
-pidgin_pixbuf_scale_down(GdkPixbuf *src, guint max_width, guint max_height,
-	GdkInterpType interp_type, gboolean preserve_ratio)
-{
-	guint cur_w, cur_h;
-	GdkPixbuf *dst;
-
-	g_return_val_if_fail(src != NULL, NULL);
-
-	if (max_width == 0 || max_height == 0) {
-		g_object_unref(src);
-		g_return_val_if_reached(NULL);
-	}
-
-	cur_w = gdk_pixbuf_get_width(src);
-	cur_h = gdk_pixbuf_get_height(src);
-
-	if (cur_w <= max_width && cur_h <= max_height)
-		return src;
-
-	/* cur_ratio = cur_w / cur_h
-	 * max_ratio = max_w / max_h
-	 */
-
-	if (!preserve_ratio) {
-		cur_w = MIN(cur_w, max_width);
-		cur_h = MIN(cur_h, max_height);
-	} else if ((guint64)cur_w * max_height > (guint64)max_width * cur_h) {
-		/* cur_w / cur_h > max_width / max_height */
-		cur_h = (guint64)max_width * cur_h / cur_w;
-		cur_w = max_width;
-	} else {
-		cur_w = (guint64)max_height * cur_w / cur_h;
-		cur_h = max_height;
-	}
-
-	if (cur_w <= 0)
-		cur_w = 1;
-	if (cur_h <= 0)
-		cur_h = 1;
-
-	dst = gdk_pixbuf_scale_simple(src, cur_w, cur_h, interp_type);
-	g_object_unref(src);
-
-	return dst;
-}
-
 GtkWidget *
 pidgin_make_scrollable(GtkWidget *child, GtkPolicyType hscrollbar_policy, GtkPolicyType vscrollbar_policy, GtkShadowType shadow_type, int width, int height)
 {