Unity

Merge lp:~bregma/unity/lp-1197569 into lp:unity

  1. lp-1197569
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3488
Proposed branch: lp:~bregma/unity/lp-1197569
Merge into: lp:unity
Diff against target: 56 lines (+11/-3)
3 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
launcher/TrashLauncherIcon.cpp (+9/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1197569
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+183270@code.launchpad.net

Commit message

moved to zeitgeist-2.0

Description of the change

= Problem description =

Move to zeitgeist-2.0 to keep up with upstream.

= The fix =

The Trash code was modified to use the new zeitgeist-2.0 API.

= Test coverage =

Changes are covered by existing tests.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3478
http://jenkins.qa.ubuntu.com/job/unity-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/213

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/325/rebuild

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

Cool transition, too bad that the vala generated code is wrong... :(

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-08-28 12:55:31 +0000
3+++ CMakeLists.txt 2013-08-30 20:12:21 +0000
4@@ -233,7 +233,7 @@
5 sigc++-2.0
6 unity-misc>=0.4.0
7 xpathselect>=1.2
8- zeitgeist-1.0>=0.3.18
9+ zeitgeist-2.0
10 )
11
12 set(UNITY_PLUGIN_DEPS ${UNITY_PLUGIN_SHARED_DEPS})
13
14=== modified file 'debian/control'
15--- debian/control 2013-08-29 19:26:30 +0000
16+++ debian/control 2013-08-30 20:12:21 +0000
17@@ -49,7 +49,7 @@
18 libxfixes-dev (>= 1:5.0.1-1),
19 libxi-dev (>= 2:1.7.1.901),
20 libxpathselect-dev (>=1.3),
21- libzeitgeist-dev (>= 0.3.18),
22+ libzeitgeist-2.0-dev,
23 pkg-config,
24 python (>= 2.7),
25 python-setuptools,
26
27=== modified file 'launcher/TrashLauncherIcon.cpp'
28--- launcher/TrashLauncherIcon.cpp 2013-07-17 23:48:49 +0000
29+++ launcher/TrashLauncherIcon.cpp 2013-08-30 20:12:21 +0000
30@@ -24,6 +24,10 @@
31 #include "config.h"
32 #include <glib/gi18n-lib.h>
33 #include <NuxCore/Logger.h>
34+// -Wunused-function applies to the entire translation unit,
35+// #pragma GCC diagnostic push/pop doesn't affect it. Boo.
36+// Problem is the Vala-generated code in <zeitgeist.h> fails -Werror.
37+#pragma GCC diagnostic warning "-Wunused-function"
38 #include <zeitgeist.h>
39
40 #include "QuicklistMenuItemLabel.h"
41@@ -175,11 +179,15 @@
42 ZeitgeistEvent *event = zeitgeist_event_new_full(ZEITGEIST_ZG_DELETE_EVENT,
43 ZEITGEIST_ZG_USER_ACTIVITY,
44 ZEITGEIST_UNITY_ACTOR.c_str(),
45+ NULL,
46 subject, NULL);
47 ZeitgeistLog *log = zeitgeist_log_get_default();
48
49 // zeitgeist takes ownership of subject, event and log
50- zeitgeist_log_insert_events_no_reply(log, event, NULL);
51+ GPtrArray *events = g_ptr_array_new();
52+ g_ptr_array_add(events, event);
53+ zeitgeist_log_insert_events_no_reply(log, events, NULL);
54+ g_ptr_array_free(events, TRUE);
55 }
56 }
57