1 files changed, 3 insertions, 153 deletions

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 174eceac4..5e01d9fcc 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -37,6 +37,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 #include <tp-account-widgets/tpaw-live-search.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-ft-factory.h"
@@ -155,69 +156,6 @@ empathy_protocol_name_for_contact (EmpathyContact *contact)
   return tp_account_get_icon_name (account);
 }
 
-GdkPixbuf *
-empathy_pixbuf_from_data (gchar *data,
-    gsize data_size)
-{
-  return empathy_pixbuf_from_data_and_mime (data, data_size, NULL);
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_data_and_mime (gchar *data,
-           gsize data_size,
-           gchar **mime_type)
-{
-  GdkPixbufLoader *loader;
-  GdkPixbufFormat *format;
-  GdkPixbuf *pixbuf = NULL;
-  gchar **mime_types;
-  GError *error = NULL;
-
-  if (!data)
-    return NULL;
-
-  loader = gdk_pixbuf_loader_new ();
-  if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size, &error))
-    {
-      DEBUG ("Failed to write to pixbuf loader: %s",
-        error ? error->message : "No error given");
-      goto out;
-    }
-
-  if (!gdk_pixbuf_loader_close (loader, &error))
-    {
-      DEBUG ("Failed to close pixbuf loader: %s",
-        error ? error->message : "No error given");
-      goto out;
-    }
-
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  if (pixbuf)
-    {
-      g_object_ref (pixbuf);
-
-      if (mime_type != NULL)
-        {
-          format = gdk_pixbuf_loader_get_format (loader);
-          mime_types = gdk_pixbuf_format_get_mime_types (format);
-
-          *mime_type = g_strdup (*mime_types);
-          if (mime_types[1] != NULL)
-            DEBUG ("Loader supports more than one mime "
-              "type! Picking the first one, %s",
-              *mime_type);
-
-          g_strfreev (mime_types);
-        }
-    }
-
-out:
-  g_clear_error (&error);
-  g_object_unref (loader);
-
-  return pixbuf;
-}
-
 struct SizeData
 {
   gint width;
@@ -654,7 +592,7 @@ empathy_pixbuf_contact_status_icon_with_icon_name (EmpathyContact *contact,
   numerator = 3;
   denominator = 4;
 
-  icon_filename = empathy_filename_from_icon_name (icon_name,
+  icon_filename = tpaw_filename_from_icon_name (icon_name,
       GTK_ICON_SIZE_MENU);
 
   if (icon_filename == NULL)
@@ -711,7 +649,7 @@ empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact *contact,
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
   account = empathy_contact_get_account (contact);
-  filename = empathy_filename_from_icon_name (
+  filename = tpaw_filename_from_icon_name (
       tp_account_get_icon_name (account), GTK_ICON_SIZE_MENU);
 
   if (filename != NULL)
@@ -723,94 +661,6 @@ empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact *contact,
   return pixbuf;
 }
 
-GdkPixbuf *
-empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf,
-    gint max_size)
-{
-  gint width, height;
-  gdouble factor;
-
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-
-  if (width > 0 && (width > max_size || height > max_size))
-    {
-      factor = (gdouble) max_size / MAX (width, height);
-
-      width = width * factor;
-      height = height * factor;
-
-      return gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_HYPER);
-    }
-
-  return g_object_ref (pixbuf);
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
-    gint size)
-{
-  GtkIconTheme *theme;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (!icon_name)
-    return NULL;
-
-  theme = gtk_icon_theme_get_default ();
-
-  pixbuf = gtk_icon_theme_load_icon (theme, icon_name, size, 0, &error);
-
-  if (error)
-    {
-      DEBUG ("Error loading icon: %s", error->message);
-      g_clear_error (&error);
-    }
-
-  return pixbuf;
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_icon_name (const gchar *icon_name,
-    GtkIconSize  icon_size)
-{
-  gint w, h;
-  gint size = 48;
-
-  if (!icon_name)
-    return NULL;
-
-  if (gtk_icon_size_lookup (icon_size, &w, &h))
-    size = (w + h) / 2;
-
-  return empathy_pixbuf_from_icon_name_sized (icon_name, size);
-}
-
-gchar *
-empathy_filename_from_icon_name (const gchar *icon_name,
-    GtkIconSize icon_size)
-{
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  gint w, h;
-  gint size = 48;
-  gchar *ret;
-
-  icon_theme = gtk_icon_theme_get_default ();
-
-  if (gtk_icon_size_lookup (icon_size, &w, &h))
-    size = (w + h) / 2;
-
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 0);
-  if (icon_info == NULL)
-    return NULL;
-
-  ret = g_strdup (gtk_icon_info_get_filename (icon_info));
-  gtk_icon_info_free (icon_info);
-
-  return ret;
-}
-
 void
 empathy_url_show (GtkWidget *parent,
       const char *url)