unity-scopes-api

Merge lp://staging/unity-scopes-api/staging into lp://staging/unity-scopes-api

  1. staging
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 334
Merged at revision: 371
Proposed branch: lp://staging/unity-scopes-api/staging
Merge into: lp://staging/unity-scopes-api
Diff against target: 276 lines (+70/-18)
12 files modified
data/scope-registry.conf.in (+1/-1)
data/smart-scopes-proxy.conf.in (+1/-1)
debian/control (+1/-0)
doc/tutorial.dox (+2/-1)
include/unity/scopes/internal/ConfigBase.h (+2/-0)
src/scopes/internal/ConfigBase.cpp (+19/-2)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/RuntimeConfig.cpp (+4/-4)
src/scopes/internal/ScopeConfig.cpp (+11/-4)
src/scopes/internal/Utils.cpp (+15/-2)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+1/-1)
test/gtest/scopes/internal/Utils/Utils_test.cpp (+11/-0)
To merge this branch: bzr merge lp://staging/unity-scopes-api/staging
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
Review via email: mp+309529@code.staging.launchpad.net

Commit message

* Be stricter on user-configurable idle timeout (1s to 5min).
* Fix crash when reading scope metadata in a Turkish locale.
* Handle running inside a snap by using the $SNAP prefix.

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: