libunity

Merge lp://qastaging/~mhr3/libunity/remote-scope-fixes into lp://qastaging/libunity

remote-scope-fixes
Merge into trunk

Proposed by Michal Hruby on 2012-04-18

Status:

Merged

Approved by:

Didier Roche-Tolomelli on 2012-04-18

Approved revision:

138

Merged at revision:

135

Proposed branch:

lp://qastaging/~mhr3/libunity/remote-scope-fixes

Merge into:

lp://qastaging/libunity

Diff against target:

201 lines (+73/-19)

5 files modified

src/unity-lens-private.vala (+8/-2)
src/unity-lens-tools.vala (+17/-2)
src/unity-scope-interface.vala (+6/-4)
src/unity-scope-private.vala (+5/-5)
src/unity-scope-proxy-remote.vala (+37/-6)

To merge this branch:

bzr merge lp://qastaging/~mhr3/libunity/remote-scope-fixes

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mikkel Kamstrup Erlandsen (community)		2012-04-18	Approve on 2012-04-18
Review via email: mp+102490@code.qastaging.launchpad.net

Commit message

Restart crashed remote scopes and fix a couple of warnings when they do crash

Description of the change

There were a couple of issues with remote scopes:

1) We didn't restart them if they crashed
2) After the scope disappeared we tried to manipulate a filter model that was unreferenced
3) ScopeError was not registered as dbus error on first call to search/global_search

These issues caused warnings when a remote scope was killed and they are gone after applying these fixes.

Revision history for this message

Mikkel Kamstrup Erlandsen (kamstrup) wrote on 2012-04-18:

Looks sensible. I am not sure if this is something we should test. Or I mean, we should, but if it's worth the (considerable) effort...

Revision history for this message

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

Yes, although we have tests where there's a lens and a remote scope talking to it, it's not registered as proper dbus service, so it can't be autostarted if it was killed. FWIW I tested all of this manually and the scopes restart now and warnings are gone, plus the changes don't touch any critical code paths for it to cause regressions.

Revision history for this message

Mikkel Kamstrup Erlandsen (kamstrup) wrote on 2012-04-18:

Agreed. I took another detailed review of the code and I agree that it looks both correct and safe.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-04-18:

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/117/console reported an error when processing this lp:~mhr3/libunity/remote-scope-fixes branch.
Not merging it.