Merge lp://qastaging/~cmiller/desktopcouch/defer-dbus-until-after-plugins into lp://qastaging/desktopcouch
Proposed by
Chad Miller
Status: | Merged |
---|---|
Approved by: | Chad Miller |
Approved revision: | 281 |
Merged at revision: | 274 |
Proposed branch: | lp://qastaging/~cmiller/desktopcouch/defer-dbus-until-after-plugins |
Merge into: | lp://qastaging/desktopcouch |
Diff against target: |
718 lines (+243/-135) 10 files modified
desktopcouch/application/local_files.py (+3/-1) desktopcouch/application/platform/windows/tests/test_base_dirs.py (+2/-2) desktopcouch/application/plugins/__init__.py (+13/-3) desktopcouch/application/plugins/tests/test_plugins.py (+3/-1) desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+33/-8) desktopcouch/application/plugins/ubuntuone_pairing.py (+62/-43) desktopcouch/application/service.py (+27/-4) desktopcouch/application/tests/test_service.py (+88/-62) desktopcouch/records/tests/test_mocked_server.py (+4/-3) desktopcouch/recordtypes/contacts/tests/test_view.py (+8/-8) |
To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/defer-dbus-until-after-plugins |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Natalia Bidart (community) | Approve | ||
Review via email:
|
Commit message
Add ability for plugins to delay DBus service activation until they are finished processing. Make ubuntuone_pairing plugin use this. (LP: #760236)
To post a comment you must log in.
Can you please make the docstring of load_plugins pep-257 compliant?
Also, I don't understand why you're passing gobject around, is that really needed?