libzeitgeist

Merge lp:~mhr3/libzeitgeist/eggdbus-stable-patch into lp:libzeitgeist/0.2

  1. eggdbus-stable-patch
  2. Merge into libzeitgeist-0.2
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 181
Proposed branch: lp:~mhr3/libzeitgeist/eggdbus-stable-patch
Merge into: lp:libzeitgeist/0.2
Diff against target: 65 lines (+28/-8)
2 files modified
src/zeitgeist-index.c (+11/-3)
src/zeitgeist-log.c (+17/-5)
To merge this branch: bzr merge lp:~mhr3/libzeitgeist/eggdbus-stable-patch
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen Approve
Review via email: mp+42595@code.launchpad.net

Description of the change

Filing merge request in behalf of Michal Hruby. See linked bug.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good. Thanks Michal!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/zeitgeist-index.c'
2--- src/zeitgeist-index.c 2010-06-10 09:29:53 +0000
3+++ src/zeitgeist-index.c 2010-12-03 09:08:09 +0000
4@@ -398,10 +398,18 @@
5 {
6 GPtrArray *events;
7 guint32 hit_count;
8+ gboolean result;
9
10 // FIXME: How to return hit count?
11- _zeitgeist_index_collect_events_and_count (egg_zeitgeist_index_search_finish,
12- self, &events, &hit_count,
13- res, error);
14+ result = _zeitgeist_index_collect_events_and_count (
15+ egg_zeitgeist_index_search_finish,
16+ self, &events, &hit_count,
17+ res, error);
18+
19+ if (!result)
20+ {
21+ return NULL;
22+ }
23+
24 return _zeitgeist_simple_result_set_new (events, hit_count);
25 }
26
27=== modified file 'src/zeitgeist-log.c'
28--- src/zeitgeist-log.c 2010-08-19 11:57:08 +0000
29+++ src/zeitgeist-log.c 2010-12-03 09:08:09 +0000
30@@ -649,9 +649,15 @@
31 GError **error)
32 {
33 GPtrArray *events;
34+ gboolean result;
35
36- _zeitgeist_log_collect_events (egg_zeitgeist_log_find_events_finish,
37- self, &events, res, error);
38+ result = _zeitgeist_log_collect_events (egg_zeitgeist_log_find_events_finish,
39+ self, &events, res, error);
40+ if (!result)
41+ {
42+ return NULL;
43+ }
44+
45 return _zeitgeist_simple_result_set_new (events, events->len);
46 }
47
48@@ -752,9 +758,15 @@
49 GError **error)
50 {
51 GPtrArray *events;
52-
53- _zeitgeist_log_collect_events (egg_zeitgeist_log_get_events_finish,
54- self, &events, res, error);
55+ gboolean result;
56+
57+ result = _zeitgeist_log_collect_events (egg_zeitgeist_log_get_events_finish,
58+ self, &events, res, error);
59+ if (!result)
60+ {
61+ return NULL;
62+ }
63+
64 return _zeitgeist_simple_result_set_new (events, events->len);
65 }
66

Subscribers

People subscribed via source and target branches