Unity Videos Lens

Merge lp:~zeitgeist/unity-lens-video/fix-1196878-port-to-libzeitgeist2 into lp:unity-lens-video

  1. fix-1196878-port-to-libzeitgeist2
  2. Merge into trunk
Status: Needs review
Proposed branch: lp:~zeitgeist/unity-lens-video/fix-1196878-port-to-libzeitgeist2
Merge into: lp:unity-lens-video
Diff against target: 176 lines (+24/-22)
7 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/Makefile.am (+2/-2)
src/blacklist-tracker.vala (+2/-2)
src/remote-scope.vala (+9/-8)
src/scope.vala (+8/-7)
tests/unit/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~zeitgeist/unity-lens-video/fix-1196878-port-to-libzeitgeist2
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Needs Fixing
PS Jenkins bot continuous-integration Pending
Review via email: mp+172511@code.launchpad.net

Commit message

Ported to libzeitgeist2

Description of the change

Fixes LP #1196878 where the lens is ported to libzeitgeist2

(PS: Already signed contributor's agreement)

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

+1

review: Approve
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Could you please update this MR? It seems that there's still a conflict in debian/control when merging with trunk.

review: Needs Fixing
Reply

Unmerged revisions

119. By Manish Sinha (मनीष सिन्हा)

Fixes LP #1196878 where the lens is ported to libzeitgeist2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-05-16 11:33:59 +0000
3+++ configure.ac 2013-07-02 09:35:32 +0000
4@@ -75,7 +75,7 @@
5 gee-1.0
6 libsoup-gnome-2.4
7 json-glib-1.0
8- zeitgeist-1.0 >= 0.3.8
9+ zeitgeist-2.0 >= 0.9.12
10 unity >= 7.0.0
11 unity-extras >= 6.91.11
12 )
13
14=== modified file 'debian/control'
15--- debian/control 2013-06-20 16:13:54 +0000
16+++ debian/control 2013-07-02 09:35:32 +0000
17@@ -12,7 +12,7 @@
18 libjson-glib-dev,
19 libsoup-gnome2.4-dev,
20 libunity-dev (>= 7.0.0),
21- libzeitgeist-dev (>= 0.3.8),
22+ libzeitgeist-2.0-dev (>= 0.9.12),
23 valac-0.18,
24 xvfb,
25 Standards-Version: 3.9.4
26
27=== modified file 'src/Makefile.am'
28--- src/Makefile.am 2013-06-20 16:13:59 +0000
29+++ src/Makefile.am 2013-07-02 09:35:32 +0000
30@@ -43,7 +43,7 @@
31 --pkg gio-unix-2.0 \
32 --pkg glib-2.0 \
33 --pkg gee-1.0 \
34- --pkg zeitgeist-1.0 \
35+ --pkg zeitgeist-2.0 \
36 --vapidir $(srcdir) \
37 --vapidir $(top_srcdir)/vapi \
38 --target-glib=2.26 \
39@@ -59,7 +59,7 @@
40 --pkg gio-unix-2.0 \
41 --pkg glib-2.0 \
42 --pkg gee-1.0 \
43- --pkg zeitgeist-1.0 \
44+ --pkg zeitgeist-2.0 \
45 --pkg libsoup-gnome-2.4 \
46 --pkg libsoup-2.4 \
47 --pkg json-glib-1.0 \
48
49=== modified file 'src/blacklist-tracker.vala'
50--- src/blacklist-tracker.vala 2012-11-19 11:00:54 +0000
51+++ src/blacklist-tracker.vala 2013-07-02 09:35:32 +0000
52@@ -101,8 +101,8 @@
53 {
54 if (e.num_subjects () > 0)
55 {
56- unowned Subject s = e.get_subject (0);
57- unowned string uri = s.get_uri ();
58+ Subject s = e.get_subject (0);
59+ unowned string uri = s.uri;
60 if (uri == null || uri == "") continue;
61
62 if (uri.has_suffix ("*"))
63
64=== modified file 'src/remote-scope.vala'
65--- src/remote-scope.vala 2013-06-20 16:13:59 +0000
66+++ src/remote-scope.vala 2013-07-02 09:35:32 +0000
67@@ -19,6 +19,7 @@
68 */
69
70 using Config;
71+using Zeitgeist;
72
73 namespace Unity.VideoLens
74 {
75@@ -497,22 +498,22 @@
76 private void zeitgeist_init () throws Error
77 {
78 zg_sources = new Zeitgeist.DataSourceRegistry ();
79- var templates = new PtrArray.sized(1);
80- var ev = new Zeitgeist.Event.full (Zeitgeist.ZG_ACCESS_EVENT, Zeitgeist.ZG_USER_ACTIVITY, "lens://unity-lens-video");
81- templates.add ((ev as GLib.Object).ref());
82+ var templates = new GenericArray<Event>();
83+ var ev = new Zeitgeist.Event.full (Zeitgeist.ZG.ACCESS_EVENT, Zeitgeist.ZG.USER_ACTIVITY, "lens://unity-lens-video");
84+ templates.add (ev);
85 var data_source = new Zeitgeist.DataSource.full ("98898", "Unity Video Lens", "", templates);
86 zg_sources.register_data_source (data_source, null);
87 }
88
89 private void zeitgeist_insert_event (string uri, string title, string icon)
90 {
91- var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO_VIDEO, Zeitgeist.NFO_REMOTE_DATA_OBJECT, "", uri, title, icon);
92- var event = new Zeitgeist.Event.full (Zeitgeist.ZG_ACCESS_EVENT, Zeitgeist.ZG_USER_ACTIVITY, "lens://unity-lens-video");
93+ var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO.VIDEO, Zeitgeist.NFO.REMOTE_DATA_OBJECT, "", uri, title, icon);
94+ var event = new Zeitgeist.Event.full (Zeitgeist.ZG.ACCESS_EVENT, Zeitgeist.ZG.USER_ACTIVITY, "lens://unity-lens-video");
95 event.add_subject (subject);
96
97- var ev_array = new PtrArray.sized(1);
98- ev_array.add ((event as GLib.Object).ref ());
99- Zeitgeist.Log.get_default ().insert_events_from_ptrarray (ev_array, null);
100+ var ev_array = new GenericArray<Event>();
101+ ev_array.add (event);
102+ Zeitgeist.Log.get_default ().insert_events_no_reply (ev_array);
103 }
104 }
105 }
106
107=== modified file 'src/scope.vala'
108--- src/scope.vala 2013-06-20 16:13:59 +0000
109+++ src/scope.vala 2013-07-02 09:35:32 +0000
110@@ -19,6 +19,7 @@
111 */
112
113 using Config;
114+using Zeitgeist;
115
116 namespace Unity.VideoLens
117 {
118@@ -194,11 +195,11 @@
119
120 var time_range = new Zeitgeist.TimeRange.to_now ();
121 var event_template = new Zeitgeist.Event ();
122- var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO_VIDEO, "", "", "", "", "");
123+ var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO.VIDEO, "", "", "", "", "");
124 event_template.add_subject (subject);
125
126- var templates = new PtrArray.sized (1);
127- templates.add ((event_template as GLib.Object).ref());
128+ var templates = new GenericArray<Event>();
129+ templates.add (event_template);
130 var results = yield Zeitgeist.Log.get_default ().find_events (time_range, templates, Zeitgeist.StorageState.ANY, MAX_ZG_EVENTS, Zeitgeist.ResultType.MOST_RECENT_SUBJECTS, cancellable);
131 process_zg_events (results, cancellable, search_status);
132 }
133@@ -210,7 +211,7 @@
134 if (Utils.is_video (path) && !Utils.is_hidden (path))
135 {
136 var file = File.new_for_path (path);
137- if (!is_blacklisted(file.get_uri ()))
138+ if (!is_blacklisted(file.get_uri()))
139 return true;
140 }
141 }
142@@ -230,7 +231,7 @@
143 if (cancellable.is_cancelled ())
144 return;
145
146- var event_uri = event.get_subject (0).get_uri ();
147+ var event_uri = event.get_subject (0).uri;
148 if (event_uri.has_prefix ("file://"))
149 {
150 try
151@@ -266,10 +267,10 @@
152 // this one can be any unicode string:
153 VideoFile video = VideoFile ()
154 {
155- title = event.get_subject (0).get_text (),
156+ title = event.get_subject (0).text,
157 comment = "",
158 uri = event_uri,
159- icon = event.get_subject (0).get_storage (),
160+ icon = event.get_subject (0).storage,
161 category = CAT_INDEX_ONLINE
162 };
163 result_list.add (video);
164
165=== modified file 'tests/unit/Makefile.am'
166--- tests/unit/Makefile.am 2013-06-20 18:12:31 +0000
167+++ tests/unit/Makefile.am 2013-07-02 09:35:32 +0000
168@@ -17,7 +17,7 @@
169 --pkg json-glib-1.0 \
170 --pkg glib-2.0 \
171 --pkg gee-1.0 \
172- --pkg zeitgeist-1.0 \
173+ --pkg zeitgeist-2.0 \
174 --pkg libsoup-gnome-2.4 \
175 --pkg libsoup-2.4 \
176 --vapidir $(srcdir) \

Subscribers

People subscribed via source and target branches