Unity Videos Lens

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

  1. use-gee-0.8
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 123
Proposed branch: lp:~3v1n0/unity-lens-video/use-gee-0.8
Merge into: lp:unity-lens-video
Diff against target: 85 lines (+6/-11)
5 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/Makefile.am (+2/-2)
src/scope.vala (+1/-6)
tests/unit/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity-lens-video/use-gee-0.8
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+285922@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
lp:~3v1n0/unity-lens-video/use-gee-0.8 updated
123. By Matthias Klose

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

124. By Marco Trevisan (Treviño)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
72 gio-2.0 >= $GLIB_REQUIRED72 gio-2.0 >= $GLIB_REQUIRED
73 gio-unix-2.0 >= $GLIB_REQUIRED73 gio-unix-2.0 >= $GLIB_REQUIRED
74 dee-1.0 >= 1.0.774 dee-1.0 >= 1.0.7
75 gee-1.075 gee-0.8
76 libsoup-gnome-2.476 libsoup-gnome-2.4
77 json-glib-1.077 json-glib-1.0
78 zeitgeist-1.0 >= 0.3.878 zeitgeist-1.0 >= 0.3.8
7979
=== 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 @@
7 dh-translations,7 dh-translations,
8 gnome-common,8 gnome-common,
9 libdee-dev (>= 1.0.7),9 libdee-dev (>= 1.0.7),
10 libgee-dev,10 libgee-0.8-dev,
11 libglib2.0-dev (>= 2.27),11 libglib2.0-dev (>= 2.27),
12 libjson-glib-dev,12 libjson-glib-dev,
13 libsoup-gnome2.4-dev,13 libsoup-gnome2.4-dev,
1414
=== 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 @@
42 --pkg gio-2.0 \42 --pkg gio-2.0 \
43 --pkg gio-unix-2.0 \43 --pkg gio-unix-2.0 \
44 --pkg glib-2.0 \44 --pkg glib-2.0 \
45 --pkg gee-1.0 \45 --pkg gee-0.8 \
46 --pkg zeitgeist-1.0 \46 --pkg zeitgeist-1.0 \
47 --vapidir $(srcdir) \47 --vapidir $(srcdir) \
48 --vapidir $(top_srcdir)/vapi \48 --vapidir $(top_srcdir)/vapi \
@@ -58,7 +58,7 @@
58 --pkg gio-2.0 \58 --pkg gio-2.0 \
59 --pkg gio-unix-2.0 \59 --pkg gio-unix-2.0 \
60 --pkg glib-2.0 \60 --pkg glib-2.0 \
61 --pkg gee-1.0 \61 --pkg gee-0.8 \
62 --pkg zeitgeist-1.0 \62 --pkg zeitgeist-1.0 \
63 --pkg libsoup-gnome-2.4 \63 --pkg libsoup-gnome-2.4 \
64 --pkg libsoup-2.4 \64 --pkg libsoup-2.4 \
6565
=== 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 @@
153 {153 {
154 GLib.Idle.add (() =>154 GLib.Idle.add (() =>
155 {155 {
156 result_list.sort ((GLib.CompareFunc?)sort_alpha);156 result_list.sort ((a, b) => { return a.lc_title.collate (b.lc_title); });
157 add_results (search, model, cat, cancellable, result_list, search_string, clear_model);157 add_results (search, model, cat, cancellable, result_list, search_string, clear_model);
158 return false;158 return false;
159 });159 });
@@ -181,11 +181,6 @@
181 }181 }
182 }182 }
183183
184 internal static int sort_alpha (VideoFile a, VideoFile b)
185 {
186 return a.lc_title.collate (b.lc_title);
187 }
188
189 private async void zg_call (GLib.Cancellable? cancellable, DeprecatedScopeSearch search_status) throws Error184 private async void zg_call (GLib.Cancellable? cancellable, DeprecatedScopeSearch search_status) throws Error
190 {185 {
191 bool active = sources.get_option ("local").active;186 bool active = sources.get_option ("local").active;
192187
=== 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 @@
16 --pkg gio-unix-2.0 \16 --pkg gio-unix-2.0 \
17 --pkg json-glib-1.0 \17 --pkg json-glib-1.0 \
18 --pkg glib-2.0 \18 --pkg glib-2.0 \
19 --pkg gee-1.0 \19 --pkg gee-0.8 \
20 --pkg zeitgeist-1.0 \20 --pkg zeitgeist-1.0 \
21 --pkg libsoup-gnome-2.4 \21 --pkg libsoup-gnome-2.4 \
22 --pkg libsoup-2.4 \22 --pkg libsoup-2.4 \

Subscribers

People subscribed via source and target branches