lp:~marcustomlinson/unity-scopes-api/merge_trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scopes-api/devel at revision 510

Marcus Tomlinson (community): Approve on 2014-10-16

PS Jenkins bot (community): Approve (continuous-integration) on 2014-10-16

Diff: 41 lines (+16/-8)

2 files modified

RELEASE_NOTES.md (+4/-2)
debian/changelog (+12/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

510. By Marcus Tomlinson on 2014-10-16

Merge trunk

509. By Pete Woods on 2014-10-15

Send country code to smart scopes.

Approved by PS Jenkins bot, Marcus Tomlinson.

508. By Michi Henning on 2014-10-14

Removed a bunch of redundant #includes.

Approved by Marcus Tomlinson, PS Jenkins bot.

507. By Marcus Tomlinson on 2014-10-13

1. Invoke callback for all known statuses when setting the callback method (To avoid losing statuses between construction and providing a callback).

2. Improved thread safety for access to AccountInfo from mainloop / non-mainloop threads.

3. Updated tests. Fixes: https://bugs.launchpad.net/bugs/1380588.

Approved by PS Jenkins bot, Pawel Stolowski.

506. By Marcus Tomlinson on 2014-10-10

Move flush_pending_session() out of refresh_service_statuses() and into get_service_statuses() to defer the wait for SignOn replies until statuses are pulled. Also, run the callback in a seperate thread so that get_service_statuses() can be called from it.

Approved by PS Jenkins bot, Pawel Stolowski.

505. By Marcus Tomlinson on 2014-10-09

1. Removed SIGNON_SESSION_DATA_UI_POLICY specification (use default always) as this is actually a bug in OA not scopes (Bug #1374394).

2. Removed pub-sub network for authentication as this is no longer needed when using the default UI policy.

3. Updated test.

Approved by Pawel Stolowski, PS Jenkins bot.

504. By Michi Henning on 2014-10-09

More permanent fix for the Zmq infinite reconnection problem.
The outgoing connection pool now runs a reaper that removes
sockets from the pool after ten seconds idle time. Fixes: https://bugs.launchpad.net/bugs/1364464, https://bugs.launchpad.net/bugs/1374206.

Approved by Marcus Tomlinson, PS Jenkins bot.

503. By Michi Henning on 2014-10-09

Fixed a few compiler warnings in OnlineAccountClient_test.

Approved by Marcus Tomlinson, PS Jenkins bot.

502. By Marcus Tomlinson on 2014-10-08

Added tests for OnlineAccountClient.

Approved by PS Jenkins bot, Pawel Stolowski.

501. By Marcus Tomlinson on 2014-10-08

1. Depending on whether OnlineAccountClient is used by the shell or by a scope, set the SIGNON_SESSION_DATA_UI_POLICY accordingly.

2. Inform scopes of successful user authentications via a pub/sub network.

3. Removed inc_logins() and dec_logins() as only one session can be active per service (now using info->session != nullptr).

4. Added better thread and exception safety.

5. Run the internal event loop within its own context to avoid clashing with external main loops. Fixes: https://bugs.launchpad.net/bugs/1374394, https://bugs.launchpad.net/bugs/1377147.

Approved by PS Jenkins bot, Pawel Stolowski.