libzeitgeist

Merge lp://staging/~rainct/libzeitgeist/986230 into lp://staging/libzeitgeist

986230
Merge into trunk

Proposed by Siegfried Gevatter on 2012-04-21

Status:

Merged

Merged at revision:

237

Proposed branch:

lp://staging/~rainct/libzeitgeist/986230

Merge into:

lp://staging/libzeitgeist

Diff against target:

201 lines (+69/-10)

2 files modified

configure.ac (+1/-1)
src/zeitgeist-log.c (+68/-9)

To merge this branch:

bzr merge lp://staging/~rainct/libzeitgeist/986230

Related bugs:

Bug #986191: [11.04→12.04 upgrade] Dash is always empty due to zeitgeist crash: Unable to upgrade from schema version 3	Medium	Fix Committed
Bug #986230: Async methods linger if daemon fails to start	Medium	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michal Hruby (community)		2012-04-21	Needs Fixing on 2012-04-23
Review via email: mp+102971@code.staging.launchpad.net

lp://staging/~rainct/libzeitgeist/986230 updated on 2012-04-21

238. By Siegfried Gevatter on 2012-04-21: Call callbacks with g_idle and properly free stuff.

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-04-23:

There's still one issue left - if the cancellable is cancelled, _finish needs to throw IO_ERROR_CANCELLED even if it wanted to throw the log_error. Ideally we'd just use g_simple_async_result_set_check_cancellable, but that's available only from 2.32, so we need to implement it manually.

review: Needs Fixing

lp://staging/~rainct/libzeitgeist/986230 updated on 2012-04-23

239. By Siegfried Gevatter on 2012-04-23

Return G_IO_ERROR_CANCELLED when the cancellable is activated

We do this by abusing GSimpleAsyncResult to get a copy of the
cancellable.

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-04-23:

Actually, looking at the non-trivial changes this requires, let's just bump the gio dependency and use the check_cancellable method.

lp://staging/~rainct/libzeitgeist/986230 updated on 2012-04-24

240. By Siegfried Gevatter on 2012-04-24: So now we're gonna use g_simple_async_result_set_check_cancellable :)

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-04-25:

To make sure this doesn't get lost: (from IRC)

- shouldn't you still check for log_error != NULL in the _finish methods?
- also log_error is not freed in finalize
- and if you use simple..._set_from_error, you don't need to copy it yourself