[shotwell] Remove libgee work-around, bump min version to 0.10



commit 4f7bdcbac984bb4021afc36318b4a63afe56507f
Author: Jens Georg <mail jensge org>
Date:   Sun Jun 12 17:53:03 2016 +0200

    Remove libgee work-around, bump min version to 0.10
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile                        |    2 +-
 plugins/common/RESTSupport.vala |   16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/Makefile b/Makefile
index 2b44a55..c48e9eb 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ THUMBNAILER_PKGS = \
 DIRECT_LIBS =
 
 EXT_PKG_VERSIONS = \
-       gee-0.8 >= 0.8.5 \
+       gee-0.8 >= 0.10.0 \
        gexiv2 >= 0.4.90 \
        gio-unix-2.0 >= 2.20 \
        glib-2.0 >= $(MIN_GLIB_VERSION) \
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index b19d723..0e08fe4 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -123,7 +123,7 @@ public class Argument {
     }
     
     public static Argument[] sort(Argument[] inputArray) {
-        FixedTreeSet<Argument> sorted_args = new FixedTreeSet<Argument>(Argument.compare);
+        Gee.TreeSet<Argument> sorted_args = new Gee.TreeSet<Argument>(Argument.compare);
 
         foreach (Argument arg in inputArray)
             sorted_args.add(arg);
@@ -678,20 +678,6 @@ public string asciify_string(string s) {
     return b.str;
 }
 
-/** @brief Work-around for a problem in libgee where a TreeSet can leak references when it
- * goes out of scope; please see https://bugzilla.gnome.org/show_bug.cgi?id=695045 for more
- * details. This class merely wraps it and adds a call to clear() to the destructor.
- */
-public class FixedTreeSet<G> : Gee.TreeSet<G> {
-    public FixedTreeSet(owned CompareDataFunc<G>? comp_func = null) {
-        base((owned) comp_func);
-    }
-    
-    ~FixedTreeSet() {
-        clear();
-    }
-}
-
 public abstract class GoogleSession : Session {
     public abstract string get_user_name();
     public abstract string get_access_token();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]