[folks] Bug 705403 — Use GLib.BytesIcon instead o f Edsf.MemoryIcon

[Philip Withnall <pwithnall src gnome org>]

commit 63217d5cb7bc83b476b84313880a005e23223416
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Aug 3 15:24:32 2013 +0200

    Bug 705403 — Use GLib.BytesIcon instead of Edsf.MemoryIcon
    
    Use GLib.BytesIcon internally instead of Edsf.MemoryIcon, which can
    be deleted. This bumps our GLib requirement to 2.37.6, but doesn’t
    affect API.
    
    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=705403

 NEWS                               |    2 +
 backends/eds/lib/Makefile.am       |    1 -
 backends/eds/lib/edsf-persona.vala |    3 +-
 backends/eds/lib/memory-icon.vala  |  135 ------------------------------------
 configure.ac                       |    2 +-
 5 files changed, 5 insertions(+), 138 deletions(-)
---
diff --git a/NEWS b/NEWS
index bfdbeb0..a3058f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Overview of changes from libfolks 0.9.5 to libfolks 0.9.6
 =========================================================
 
 Dependencies:
+• GLib ≥ 2.37.6
 
 Major changes:
 
@@ -12,6 +13,7 @@ Bugs fixed:
 • Bug 705608 — FolksTelepathy: tpf_persona_get_contact: return value: Missing
   (transfer) annotation
 • Bug 697262 — uses deprecated e-d-s functions (Xavier)
+• Bug 705403 — Use GLib.BytesIcon instead of Edsf.MemoryIcon
 
 API changes:
 
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 536cb38..ae047c9 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -30,7 +30,6 @@ libfolks_eds_la_SOURCES = \
        edsf-namespace.vala \
        edsf-persona.vala \
        edsf-persona-store.vala \
-       memory-icon.vala \
        $(NULL)
 
 libfolks_eds_la_VALAFLAGS = \
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 5f3ff0a..55d77ae 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -1516,7 +1516,8 @@ public class Edsf.Persona : Folks.Persona,
                 return null;
               }
 
-            return new Edsf.MemoryIcon ((!) mime_type, (!) data);
+            var bytes = new Bytes ((!) data);
+            return new BytesIcon (bytes);
           default:
             return null;
         }
diff --git a/configure.ac b/configure.ac
index cfeeaab..d00dc94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,7 @@ AM_CONDITIONAL([ENABLE_LIBSOCIALWEB],
 # Dependencies
 # -----------------------------------------------------------
 
-GLIB_REQUIRED=2.32.0
+GLIB_REQUIRED=2.37.6
 VALA_REQUIRED=0.17.6
 VALADOC_REQUIRED=0.3.1
 TRACKER_SPARQL_MAJOR=0.16