lp://qastaging/~mikemc/ubuntuone-control-panel/fix-sync-status

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntuone-control-panel at revision 356

Alejandro J. Cura (community): Approve on 2012-09-06

Roberto Alsina (community): Approve on 2012-09-06

Diff: 313 lines (+92/-56)

9 files modified

ubuntuone/controlpanel/backend.py (+21/-17)
ubuntuone/controlpanel/dbus_service.py (+1/-2)
ubuntuone/controlpanel/dbustests/test_dbus_service.py (+12/-25)
ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+1/-1)
ubuntuone/controlpanel/gui/qt/systray.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+1/-0)
ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+4/-3)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+4/-4)
ubuntuone/controlpanel/tests/test_backend.py (+47/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1044197: sync menu and sync indicator in main window are out of sync

High

Fix Released

Link a bug report

Related blueprints

359. By Mike McCracken on 2012-09-06

remove unnecessary property for accessing status_changed_handlers

358. By Mike McCracken on 2012-09-05

Fix typos

357. By Mike McCracken on 2012-09-05

fix dbus tests, clean up code lint

356. By Mike McCracken on 2012-09-05

Added support in controlbackend for multiple status handlers.

Both the filsyncstatus.py widget in the main window and the menu item
in systray.py try to set the handler. This results in the
filesyncstatus widget no longer being updated, as the single variable
holding the callback in controlbackend is overwritten.

The issue does not appear on linux, because although the
controlbackend only has one variable, when it is changed, it wraps the
new callback and calls sd_client.set_status_changed_handler() with
that wrapper. On linux, the dbus implementation of the proxy that
sd_client uses *ADDS* the wrapper, while on the other platforms the
twisted implementation just overwrites the old handler.

This branch changes it so that we only ever set the sd_client callback
once, to a function in controlbackend that calls each of a list of
callbacks.

The filesyncstatus and systray widgets now call an
add_status_changed_handler function that adds to that list instead of
setting the single callback via a property.

Tests are included that use the new API, but would break if the new
API behaved the same as the old one.

IRL test shows this working on darwin. I had great difficulty getting
windows running from source, so I didn't do an IRL test on windows.

355. By Roberto Alsina on 2012-08-30

- Made --with-icon the default on Darwin

354. By Roberto Alsina on 2012-08-30

- Disabled search box until it's ready to work (Fixes LP: 1042885)

353. By Mike McCracken on 2012-08-30

- Fix race in backend get_credentials call. (LP: #1042860)

352. By Diego Sarmentero on 2012-08-28

- Adding functionality to the Share Links Tab (LP: #1039142).

351. By Roberto Alsina on 2012-08-27

- Fixed saving/restoring the speed throttling (Fixes LP:1040899)

350. By Roberto Alsina on 2012-08-25

- Switched to non-native dialog on darwin (LP:1040905).