Re: [Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
Review: Approve continuous-integration -- https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
The proposal to merge lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 -- https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
The proposal to merge lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files has been updated. Commit Message changed to: Port unity-lens-applications to libzeitgeist2 For more details, see: https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 -- https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
The proposal to merge lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 -- https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
Review: Approve Everything work as expected, thanks for the contribution. -- https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into lp:unity-lens-files
Manish Sinha (मनीष सिन्हा) has proposed merging
lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2 into
lp:unity-lens-files.
Requested reviews:
Unity Team (unity-team)
Related bugs:
Bug #1196800 in unity-lens-files: "Port Unity Files Lens to libzeitgeist2"
https://bugs.launchpad.net/unity-lens-files/+bug/1196800
For more details, see:
https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464
Port unity-lens-files to libzeitgeist2 as the older libzeitgeist
(libzeitgeist1) would be deprecated.
(PS: Have signed the contributor's agreement)
--
https://code.launchpad.net/~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2/+merge/172464
Your team Zeitgeist Framework Team is subscribed to branch
lp:~zeitgeist/unity-lens-files/fix-1196800-port-to-libzeitgeist2.
=== modified file 'configure.ac'
--- configure.ac 2013-05-16 11:42:23 +
+++ configure.ac 2013-07-02 06:07:25 +
@@ -62,7 +62,7 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gee-1.0
dee-1.0 >= 0.5.16
- zeitgeist-1.0 >= 0.3.17
+ zeitgeist-2.0 >= 0.9.12
unity >= 7.0.0)
=== modified file 'debian/control'
--- debian/control 2013-05-16 16:47:22 +
+++ debian/control 2013-07-02 06:07:25 +
@@ -9,9 +9,9 @@
libglib2.0-dev (>= 2.27),
libgee-dev,
libdee-dev (>= 0.5.16),
- libzeitgeist-dev (>= 0.3.17),
+ libzeitgeist-dev (>= 0.9.12),
libunity-dev (>= 7.0.0),
- zeitgeist-core (>= 0.5.0-0ubuntu2),
+ zeitgeist-core (>= 0.9.12),
dh-autoreconf,
dh-translations,
Standards-Version: 3.9.4
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-05-16 11:41:12 +
+++ src/Makefile.am 2013-07-02 06:07:25 +
@@ -23,7 +23,7 @@
unity_files_daemon_VALAFLAGS = \
-C \
--pkg dee-1.0 \
- --pkg zeitgeist-1.0 \
+ --pkg zeitgeist-2.0 \
--pkg unity \
--pkg gee-1.0 \
--pkg gio-2.0 \
=== modified file 'src/blacklist-tracker.vala'
--- src/blacklist-tracker.vala 2012-03-15 10:20:44 +
+++ src/blacklist-tracker.vala 2013-07-02 06:07:25 +
@@ -101,8 +101,8 @@
{
if (e.num_subjects () > 0)
{
- unowned Subject s = e.get_subject (0);
- unowned string uri = s.get_uri ();
+ Subject s = e.get_subject (0);
+ string uri = s.uri;
if (uri == null || uri == "") continue;
if (uri.has_suffix ("*"))
=== modified file 'src/daemon.vala'
--- src/daemon.vala 2013-06-21 20:49:58 +
+++ src/daemon.vala 2013-07-02 06:07:25 +
@@ -78,14 +78,14 @@
index = new Zeitgeist.Index ();
/* Listen for all file:// related events from Zeitgeist */
- var templates = new PtrArray ();
+ var templates = new GenericArray();
var event = new Zeitgeist.Event ();
var subject = new Zeitgeist.Subject ();
- subject.set_uri ("file://*");
+ subject.uri = "file://*";
event.add_subject (subject);
- templates.add (event.ref ());
+ templates.add (event);
monitor = new Zeitgeist.Monitor (new Zeitgeist.TimeRange.from_now (),
- (owned) templates);
+ templates);
monitor.events_inserted.connect (on_zeitgeist_changed);
monitor.events_deleted.connect (on_zeitgeist_changed);
log.install_monitor (monitor);
@@ -216,76 +216,75 @@
string manifestation, string uri_prefix)
{
Event event;
+ Subject sub;
/* Section.ALL_FILES */
- event = new Event.full("", manifestation, "",
- new Subject.full (uri_prefix,
- "", "", "", "", "", ""));
+ event = new Event.full("", manifestation, "", "");
+ sub = new Subject.full(uri_prefix, "", "", "", "", "", "");
+ event.add_subject(sub);
templates["all"] = event;
/* Section.DOCUMENTS */
- event = new Event.full("", manifestation, "",
- new Subject.full (uri_prefix,
- NFO_DOCUMENT,
- "", "", "", "", ""),
- new Subject.full ("",
- "!"+NFO_PRESENTATION,
- "", "", "", "", ""));
+ event = new Event.full("", manifestation, "", "");
+ sub = new Subject.full (uri_prefix, NFO.DOCUMENT, "", "", "", "", "");
+ event.add_subject(sub);
+ sub = new Subject.full ("", "!"+NFO.PRESENTATION, "", "", "", "", "");
+ event.add_subject(sub);
templates["documents"] = event;
/* Section.FOLDERS
* - we're using special ORIGIN queries here */
- event = new E
