Merge lp:~3v1n0/unity-lens-video/use-gee-0.8 into lp:unity-lens-video

[Marco Trevisan (Treviño)]

Build using libgee-0.8-dev instead of libgee-dev

[Marco Trevisan (Treviño) (3v1n0)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

[lp:~3v1n0/unity-lens-video/use-gee-0.8]

123. By Matthias Klose on 2016-02-12

Build using libgee-0.8-dev instead of libgee-dev

124. By Marco Trevisan (Treviño) on 2016-02-12

scope: fix sort function using proper CompareDataFunc (through lambda)

=== modified file 'configure.ac'
--- configure.ac	2013-05-16 11:33:59 +0000
+++ configure.ac	2016-02-12 19:38:06 +0000
@@ -72,7 +72,7 @@
                   gio-2.0 >= $GLIB_REQUIRED
                   gio-unix-2.0 >= $GLIB_REQUIRED
                   dee-1.0 >= 1.0.7
-                  gee-1.0
+                  gee-0.8
                   libsoup-gnome-2.4
                   json-glib-1.0
                   zeitgeist-1.0 >= 0.3.8

=== modified file 'debian/control'
--- debian/control	2013-09-17 09:11:03 +0000
+++ debian/control	2016-02-12 19:38:06 +0000
@@ -7,7 +7,7 @@
                dh-translations,
                gnome-common,
                libdee-dev (>= 1.0.7),
-               libgee-dev,
+               libgee-0.8-dev,
                libglib2.0-dev (>= 2.27),
                libjson-glib-dev,
                libsoup-gnome2.4-dev,

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-09-17 11:11:02 +0000
+++ src/Makefile.am	2016-02-12 19:38:06 +0000
@@ -42,7 +42,7 @@
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
   --pkg glib-2.0 \
-  --pkg gee-1.0 \
+  --pkg gee-0.8 \
   --pkg zeitgeist-1.0 \
   --vapidir $(srcdir) \
   --vapidir $(top_srcdir)/vapi \
@@ -58,7 +58,7 @@
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
   --pkg glib-2.0 \
-  --pkg gee-1.0 \
+  --pkg gee-0.8 \
   --pkg zeitgeist-1.0 \
   --pkg libsoup-gnome-2.4 \
   --pkg libsoup-2.4 \

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-06-20 16:13:59 +0000
+++ src/scope.vala	2016-02-12 19:38:06 +0000
@@ -153,7 +153,7 @@
       {
         GLib.Idle.add (() =>
         {
-          result_list.sort ((GLib.CompareFunc?)sort_alpha);
+          result_list.sort ((a, b) => { return a.lc_title.collate (b.lc_title); });
           add_results (search, model, cat, cancellable, result_list, search_string, clear_model);
           return false;
         });
@@ -181,11 +181,6 @@
       }
     }
 
-    internal static int sort_alpha (VideoFile a, VideoFile b)
-    {
-      return a.lc_title.collate (b.lc_title);
-    }
-
     private async void zg_call (GLib.Cancellable? cancellable, DeprecatedScopeSearch search_status) throws Error
     {
       bool active = sources.get_option ("local").active;

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2013-09-17 11:11:02 +0000
+++ tests/unit/Makefile.am	2016-02-12 19:38:06 +0000
@@ -16,7 +16,7 @@
 	  --pkg gio-unix-2.0 \
 	  --pkg json-glib-1.0 \
 	  --pkg glib-2.0 \
-	  --pkg gee-1.0 \
+	  --pkg gee-0.8 \
 	  --pkg zeitgeist-1.0 \
 	  --pkg libsoup-gnome-2.4 \
 	  --pkg libsoup-2.4 \