Merge lp://qastaging/~mhr3/libzeitgeist/various-fixes into lp://qastaging/libzeitgeist

Proposed by Michal Hruby
Status: Merged
Merge reported by: Mikkel Kamstrup Erlandsen
Merged at revision: not available
Proposed branch: lp://qastaging/~mhr3/libzeitgeist/various-fixes
Merge into: lp://qastaging/libzeitgeist
Diff against target: 398 lines (+128/-67)
9 files modified
bindings/zeitgeist-1.0-custom.vala (+3/-0)
bindings/zeitgeist-1.0.gi (+82/-34)
bindings/zeitgeist-1.0.metadata (+4/-2)
bindings/zeitgeist-1.0.vapi (+23/-13)
configure.ac (+1/-1)
src/zeitgeist-log.c (+8/-8)
src/zeitgeist-log.h (+2/-2)
src/zeitgeist-monitor.c (+2/-6)
src/zeitgeist-monitor.h (+3/-1)
To merge this branch: bzr merge lp://qastaging/~mhr3/libzeitgeist/various-fixes
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen review and distcheck Approve
Review via email: mp+24338@code.qastaging.launchpad.net

Description of the change

More binding related fixes.

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

Looks good I think. Could you elaborate a bit on what the intention of these fixes are?

Also; the primary goal seems to be adding the ZeitgeistMonitor API, but why do you need the EggZeitgeistMonitor? It's not an exported symbol of the lib (just an impl detail)...

review: Needs Information
Revision history for this message
Michal Hruby (mhr3) wrote :

Yes, primary goal is addition of ZeitgeistMonitor, other than that there are fixes so now all ZeitgeistLog methods should be usable (and leak-free) in Vala.

As for EggZeitgeistMonitor, I had to define it, cause the introspection finds that ZeitgeistMonitor implements it and without the dummy definition it's not possible to generate the vapi, still it's defined as empty interface - so also just an impl detail.

The only issue is that the vapi was generated using git vapigen and the insert_events_from_ptrarray method will only work with git Vala, but once 0.8.2 is released, it will be fine.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

One more thing before I merge. How about changing the signature of Log.insert_events_from_ptrarray() from your new:

 zeitgeist_log_insert_events_from_ptrarray (ZeitgeistLog *self,
                                            GCancellable *cancellable,
                                            GPtrArray *events,
                                            GAsyncReadyCallback callback,
                                            gpointer user_data);

to:

 zeitgeist_log_insert_events_from_ptrarray (ZeitgeistLog *self,
                                            GPtrArray *events,
                                            GCancellable *cancellable,
                                            GAsyncReadyCallback callback,
                                            gpointer user_data);

Ie. making 'events' the second arg. That way the signature is consistent with how GIO does it. See fx. g_output_stream_write_async().

Sorry for the fuzz! :-)

review: Needs Fixing
107. By Mikkel Kamstrup Erlandsen <kamstrup@hardback>

Add zeitgeist-1.0.types to doc generation. This makes gtk-doc include properties and signals for the classes

108. By Mikkel Kamstrup Erlandsen <kamstrup@hardback>

Fix ref to egg_zeitgeist_storage_state_get_type in docs. Should be zeitgeist_storage_state_get_type

Revision history for this message
Michal Hruby (mhr3) wrote :

Yep, I missed that, fixed and pushed.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Merged. Thanks a bunch for your hard work!

review: Approve (review and distcheck)
109. By Mikkel Kamstrup Erlandsen <kamstrup@hardback>

Merge Michal Hruby's branch lp:~mhr3/libzeitgeist/various-fixes into trunk. This fixes ZeitgeistMonitor's Vala API and makes the method signature of zeitgeist_log_insert_events_from_ptrarray() be in line with those of GIO async methods.

Also lower EggDBus requirements to 0.5 (from 0.6)

110. By Mikkel Kamstrup Erlandsen <kamstrup@hardback>

Improve docs for ZeitgeistMonitor and make the event-templates and time-range properties read-only.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches