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

[Paweł Stołowski]

Implementation of activate_result_action call. Updated doc for scope.ini file in tutorial and CONFIGFILES. Fixes: https://bugs.launchpad.net/bugs/1452681, and https://bugs.launchpad.net/bugs/1412367

Devel into trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/613/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/613/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-15 15:23:45 +0000
+++ CMakeLists.txt	2015-06-09 10:03:04 +0000
@@ -70,7 +70,7 @@
 pkg_check_modules(LIBACCOUNTS libaccounts-glib REQUIRED)
 pkg_check_modules(LIBSIGNON libsignon-glib REQUIRED)
 pkg_check_modules(ZMQLIB libzmq REQUIRED)
-pkg_check_modules(NET_CPP net-cpp REQUIRED)
+pkg_check_modules(NET_CPP net-cpp>=1.2.0 REQUIRED)
 
 find_library(ZMQPPLIB zmqpp)
 if(NOT ZMQPPLIB)
@@ -154,15 +154,6 @@
     ${OTHER_INCLUDE_DIRS}
 )
 
-# We require g++ 4.9, to avoid ABI breakage with earlier version.
-# Note that this must match what is specifed in debian/control.
-set(cxx_version_required 4.9)
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    if (NOT CMAKE_CXX_COMPILER_VERSION MATCHES "^${cxx_version_required}")
-        message(FATAL_ERROR "g++ version must be ${cxx_version_required}, found ${CMAKE_CXX_COMPILER_VERSION}!")
-    endif()
-endif()
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wno-variadic-macros -Wextra -fPIC")
 
 # By default, all symbols are visible in the library. We strip out things we don't
@@ -227,7 +218,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 6)
-set(UNITY_SCOPES_MICRO 17)
+set(UNITY_SCOPES_MICRO 18)
 set(UNITY_SCOPES_SOVERSION 3)
 
 # Version for testing, with all symbols visible

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2015-02-04 07:08:27 +0000
+++ CONFIGFILES	2015-06-09 10:03:04 +0000
@@ -248,6 +248,16 @@
 
   The default value is 5000 milliseconds.
 
+- ChildScopes.Timeout
+
+  The timeout to be used when invoking either child_scopes() or set_child_scopes()
+  on a scope. These methods require more time to execute than other scope methods
+  as they read from and write to disk.
+
+  Only values in the range 10 to 15000 milliseconds are accepted.
+
+  The default value is 2000 milliseconds.
+
 
 Registry.ini
 ------------
@@ -338,6 +348,9 @@
 <scope_id>.ini
 --------------
 
+NOTE: Only undocumented and deprecated keys are listed here.
+      See tutorial.dox for the "official" list of keys.
+
 The recognized groups in this file are:
 
 - ScopeConfig
@@ -345,7 +358,7 @@
 
 The following keys are recognized in the ScopeConfig group:
 
-- Override
+- Override (undocumented)
 
   Determines whether an OEM scope is allowed to override a Canonical scope. This key is used only by Canonical
   scopes. If true, the Canonical scope can be replaced by an OEM scope with the same ID. The default value
@@ -353,44 +366,11 @@
 
   For OEM scopes and click scopes, the setting of this key is ignored.
 
-- DisplayName
-
-  The display name of a scope (mandatory, localizable).
-
-- Description
-
-  The description of a scope (mandatory, localizable).
-
-- Author
-
-  The author of the scope (mandatory).
-
-- Version
-
-  A integer describing the scope version. The setting is optional, but we strongly
-  recommend to set it. If the behavior of your scope changes in any way that is
-  visible to the query source (such having added or removed a result attribute),
-  you should increment the version number. This allows an aggregating scope to
-  adjust its behavior according to which version of your scope is installed.
-  If not set, the default value is 0. You can set the value to any integer >= 1.
-
-- Art
-
-  Artwork to be shown for the scope. The default value is the empty string.
-
-- Icon
-
-  The icon to be shown for the scope. The default value is the empty string.
-
-- SearchHint
-
-  A search hint for on-screen display (localizable). The default value is the empty string.
-
-- HotKey
+- HotKey (undocumented, currently unused)
 
   The hot key for the scope. The default value is the empty string.
 
-- ChildScopes
+- ChildScopes (deprecated)
 
   The list of ids of scopes aggregated by this scope (if any). The values in this list
   must be separated by semicolons. This list is translated to the names of
@@ -399,60 +379,15 @@
   Note: make sure there are no trailing spaces following
   the ids, as they will be preserved.
 
-- Invisible
+- Invisible (undocumented)
 
   Whether the scope is hidden in the UI. The default value is false.
 
-- ScopeRunner
-
-  A custom scoperunner command-line to be executed when the scope is invoked.
-  The following placeholders can be used to substitute config paths where required:
-
-  - %R - absolute path to the run time .ini config file
-  - %S - absolute path to the scope's .ini config file
-
-  E.g. "ScopeRunner = /usr/bin/gdb --ex run --args /usr/lib/x86_64-linux-gnu/unity-scopes/scoperunner %R %S"
-  
-  If not set, the default scoperunner is used.
-
-- IdleTimeout
-
-  The amount of time (in seconds) a running scope can be inactive before it will automatically shut down.
-  If not set, a default value of 40 is used.
-
-- ResultsTtlType
-
-  If set, the results for this scope will be set to expire, and be refreshed. Valid values are:
-
-  - None
-
-  - Small - in the order of a minute
-
-  - Medium - in the order of a few minutes
-
-  - Large - in the order of an hour
-
-- LocationDataNeeded
-
-  Whether the scope wants to have location data delivered to it. Note that this does not mean that the scope
-  will actually receive location data at run time. (The user may deny access, or may only provide approximate
-  location data.)
-
-  If not set, the default value is false.
-
-- Keywords
-
-  A list of keywords this scope falls under (if any). The values in this list must be separated by semicolons.
-
-  E.g. "Keywords = music;video"
-
-  Note: make sure there are no trailing spaces following the keywords, as they will be preserved.
-
-- IsAggregator
-
-  Whether the scope is an aggregator. The default value is false.
-
+- DebugMode (undocumented)
+
+  Disables a bunch of timeouts when debugging a scope with the SDK.
+  Default value is false.
 
 The following keys are recognized in the Appearance group:
 
-- TODO: document this
+- see tutorial.dox

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2015-04-15 15:23:45 +0000
+++ RELEASE_NOTES.md	2015-06-09 10:03:04 +0000
@@ -1,6 +1,14 @@
 Release notes
 =============
 
+Changes in version 0.6.18
+=========================
+  - Allow child_scopes() and set_child_scopes() methods more time to
+    execute as they read from and write to disk.
+  - Added ChildScopes.Timeout configuration parameter to Zmq.ini
+  - Added API for activation of in-card result actions - see
+    ScopeBase::activate_result_action() and ActivationResponse::Status::UpdateResult.
+
 Changes in version 0.6.17
 =========================
   - Added is_account_login_result() method to Result class.

=== modified file 'STRUCTS'
--- STRUCTS	2015-02-11 17:09:45 +0000
+++ STRUCTS	2015-06-09 10:03:04 +0000
@@ -156,8 +156,10 @@
 
 ActivationResponse (returned by serialize())
 ============================================
- 'status'      : int (corresponds to ActivationResponse::Status enum)
- 'scope_data'  : variant
+ 'status'         : int (corresponds to ActivationResponse::Status enum)
+ 'scope_data'     : variant
+ 'query'          : variant (optional)
+ 'updated_result' : variant (optional)
 
 QueryMetadata (returned by serialize())
 =======================================

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-26 09:06:53 +0000
+++ debian/changelog	2015-06-09 10:03:04 +0000
@@ -1,3 +1,15 @@
+unity-scopes-api (0.6.18-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Allow child_scopes() and set_child_scopes() methods more time to
+    execute as they read from and write to disk.
+  * Added ChildScopes.Timeout configuration parameter to Zmq.ini
+
+  [ Pawel Stolowski ]
+  * Added API for activation of in-card result actions.
+
+ -- Pawel Stolowski <[e-mail]>  Mon, 01 Jun 2015 10:14:41 +0000
+
 unity-scopes-api (0.6.17+15.10.20150526-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-02-05 14:57:01 +0000
+++ debian/control	2015-06-09 10:03:04 +0000
@@ -7,12 +7,7 @@
                dbus-test-runner,
                debhelper (>= 9),
                doxygen,
-# We rely on C++11 features, and to prevent from ABI breaks
-# in libstdc++ causing us issues, we explicitly select a G++
-# version. To allow cross-compiling to work, we also must
-# append :native to g++-4.9 so we don't try to run armhf g++
-# on an x86 CPU for example, when cross-compiling.
-               g++-4.9:native,
+               g++,
                google-mock,
                graphviz,
                libaccounts-glib-dev,
@@ -25,7 +20,7 @@
                libdbustest1-dev,
                libjsoncpp-dev,
                liblttng-ust-dev,
-               libnet-cpp-dev,
+               libnet-cpp-dev (>= 1.2.0),
                libprocess-cpp-dev (>= 1.0.1),
                libsignon-glib-dev,
                libunity-api-dev (>= 7.80.7~),

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2015-05-26 09:06:53 +0000
+++ debian/libunity-scopes3.symbols	2015-06-09 10:03:04 +0000
@@ -120,6 +120,7 @@
  (c++)"unity::scopes::ActivationQueryBase::activate()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationQueryBase::~ActivationQueryBase()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationQueryBase::ActivationQueryBase(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.5.0+14.10.20140619
+ (c++)"unity::scopes::ActivationQueryBase::ActivationQueryBase(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::ActivationQueryBase::ActivationQueryBase(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.0+14.10.20140619
  (c++)"unity::scopes::ActivationQueryBase::cancelled()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationQueryBase::fwd() const@Base" 0.5.0+14.10.20140619
@@ -131,6 +132,7 @@
  (c++)"unity::scopes::ActivationResponse::ActivationResponse(unity::scopes::ActivationResponse::Status)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::ActivationResponse(unity::scopes::CannedQuery const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::ActivationResponse(unity::scopes::internal::ActivationResponseImpl*)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::ActivationResponse::ActivationResponse(unity::scopes::Result const&)@Base" 0replaceme
  (c++)"unity::scopes::ActivationResponse::operator=(unity::scopes::ActivationResponse&&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::operator=(unity::scopes::ActivationResponse const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::query() const@Base" 0.4.0+14.04.20140312.1
@@ -138,6 +140,7 @@
  (c++)"unity::scopes::ActivationResponse::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::set_scope_data(unity::scopes::Variant const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ActivationResponse::status() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::ActivationResponse::updated_result() const@Base" 0replaceme
  (c++)"unity::scopes::CannedQuery::~CannedQuery()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::CannedQuery(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::CannedQuery(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -507,6 +510,7 @@
  (c++)"unity::scopes::internal::ScopeConfig::scope_runner() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeConfig::search_hint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::version() const@Base" 0.6.9+15.04.20141129
+ (c++)"unity::scopes::internal::ScopeImpl::activate_result_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeImpl::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::child_scopes()@Base" 0.6.15+15.04.20150407
  (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.6.11+15.04.20150119
@@ -577,6 +581,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::settings_definitions() const@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_version(int)@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::internal::ScopeMetadataImpl::version() const@Base" 0.6.9+15.04.20141129
+ (c++)"unity::scopes::internal::ScopeObject::activate_result_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::child_scopes() const@Base" 0.6.15+15.04.20150407
  (c++)"unity::scopes::internal::ScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
@@ -607,6 +612,7 @@
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::~SSRegistryObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSRegistryObject(std::shared_ptr<unity::scopes::internal::MiddlewareBase>, unity::scopes::internal::smartscopes::SSConfig const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSSettingsDef::~SSSettingsDef()@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::smartscopes::SSScopeObject::activate_result_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::child_scopes() const@Base" 0.6.15+15.04.20150407
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
@@ -812,6 +818,7 @@
  (c++)"unity::scopes::Runtime::~Runtime()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::Runtime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::ScopeBase::activate_result_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::app_directory() const@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::ScopeBase::cache_directory() const@Base" 0.6.0+14.10.20140804.1

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2015-04-22 13:19:12 +0000
+++ doc/tutorial.dox	2015-06-09 10:03:04 +0000
@@ -181,7 +181,7 @@
 The scopes run time calls \link unity::scopes::ScopeBase::stop() stop()\endlink to inform your scope
 that it should shut down. You can use this method to perform any one-time clean-up.
 
-Prior to sending any queries, the scopes run time calls \link unity::scopes::ScopeBase::run() run()\endlink if your `stop()` method
+Prior to sending any queries, the scopes run time calls \link unity::scopes::ScopeBase::run() run()\endlink if your `start()` method
 completed successfully (did not throw an exception). The `run()` method
 is called by a separate thread that you can use for your own purposes, for example, to run an event loop.
 The scopes run time has no further interest in this thread, but you must ensure that, if you do not return
@@ -191,7 +191,7 @@
 
 \paragraph handlingsearch Handling search
 
-The unity::scopes::ScopeBase::search() method is called once for each query. Its purpose is to instantiante
+The unity::scopes::ScopeBase::search() method is called once for each query. Its purpose is to instantiate
 and return a new C++ instance that encapsulates the query, that is, `search()` is a factory method.
 (Do not start execution of the query as part of `search()`; the query object has a separate method for this.)
 
@@ -295,7 +295,7 @@
 `run()` to execute the query.
 
 The \link unity::scopes::SearchReplyProxy SearchReplyProxy\endlink that is passed to `run()` is an invocation
-handle that allows you push results for the query back towards the client. (`SearchReplyProxy` is a `shared_ptr`
+handle that allows you to push results for the query back towards the client. (`SearchReplyProxy` is a `shared_ptr`
 to a \link unity::scopes::SearchReply SearchReply\endlink object.)
 
 Two important methods of `SerchReply` are \link unity::scopes::SearchReply::register_category register_category()\endlink
@@ -1240,8 +1240,8 @@
     SearchHint = hint text displayed to user when viewing scope
     HotKey =
     ResultsTtlType = None, Small, Medium, or Large
-    ChildScopes =
     Keywords =
+    IsAggregator = true or false
     IdleTimeout = idle timeout in seconds
     LocationDataNeeded = true or false
     ScopeRunner = path_to_scope_runner args... %R %S
@@ -1274,10 +1274,24 @@
 your scope is installed.
 If not set, the default value is 0. You can set the value to any integer >= 1.
 
+The `SearchHint` key provides text that may be shown by the UI, such as "Enter a city name".
+
+The `Keywords` key is optional, but we recommend that you use it. Keywords are used by aggregators
+to collect results from scopes of similar type (E.g. The Music scope will aggregate scopes with the
+keyword "music", and so on). The value of `Keywords` should specify a list of keywords your scope
+falls under. This value must be a semicolon separated list (E.g. `Keywords = music;video`).
+
+The `IsAggregator` key must be set to `true` for aggregating scopes. The default value is `false`.
+
 The `IdleTimeout` key controls how long a scope can remain idle before it is told to stop by the registry (or
 killed if it does not stop within 4 seconds). The default idle timeout is 40 seconds, meaning that a
 scope will be told to stop if no query was sent to it for that amount of time.
 
+`ResultTtl` determines how long results should be cached by the UI before they are considered "stale"
+and should be refreshed. `None` indicates that results remain valid indefinitely; `Small` indicates
+results are valid for around a minute; `Medium` indicates that results are valid for a few minutes;
+`Large` indicates that results remain valid for around an hour.
+
 `LocationDataNeeded` should be set to `true` if the scope requires location data. In that case, the
 \link unity::scopes::SearchMetadata SearchMetadata\endlink provides access to
 \link unity::scopes::Location Location\endlink information
@@ -1293,8 +1307,8 @@
 The `%R` expands to the path to the `Runtime.ini` config file, and `%S` expands to the scope's `.ini` file.
 
 The `Appearance` group and all keys within it are optional and can be used to customize the look of the scope.
-Some of the `Appearance` keys (such as `PageHeader.Background`) require background scheme uris.
-Valid uris for these keys include:
+Some of the `Appearance` keys (such as `PageHeader.Background`) require background scheme URIs.
+Valid URIs for these keys include:
 
 <ul>
 <li>color:///\#aarrggbb</li>
@@ -1304,17 +1318,6 @@
 <li>http://remote-server.com/path/to/image</li>
 </ul>
 
-The value of `ChildScopes` key is to be used by aggregator scopes. It must be a semicolon separated list of scope identifiers that
-might be aggregated by this scope, for example:
-
-`ChildScopes = com.foo.bar;com.foo.bar2`
-
-This list of scopes is translated to the names of children scopes when in the scopes overview page of the Unity Dash.
-
-The `Keywords` key is optional, but we recommend that you use it. Keywords are used by aggregators to collect results from scopes of
-similar type (E.g. The Music scope will aggregate scopes with the keyword "music", and so on). The value of `Keywords` should specify a
-list of keywords your scope falls under. Like `ChildScopes`, this value must be a semicolon separated list (E.g. `Keywords = music;video`).
-
 \note Please refer to the <a href="https://developer.ubuntu.com/en/scopes/tutorials/scope-keywords/">Scope Keywords</a>
 tutorial document for more detail on using keywords in your scope.
 

=== modified file 'include/unity/scopes/AbstractScopeBase.h'
--- include/unity/scopes/AbstractScopeBase.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/AbstractScopeBase.h	2015-06-09 10:03:04 +0000
@@ -62,6 +62,10 @@
     virtual ChildScopeList find_child_scopes() const = 0;
     virtual ChildScopeList child_scopes() const = 0;
 
+    virtual ActivationQueryBase::UPtr activate_result_action(Result const& result,
+            ActionMetadata const& metadata,
+            std::string const& action_id) = 0;
+
 protected:
     AbstractScopeBase();
 /// @endcond

=== modified file 'include/unity/scopes/ActivationQueryBase.h'
--- include/unity/scopes/ActivationQueryBase.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/ActivationQueryBase.h	2015-06-09 10:03:04 +0000
@@ -70,6 +70,15 @@
     ActivationQueryBase(Result const& result, ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id);
 
     /**
+     \brief Create ActivationQueryBase.
+
+     \param update_result The result received by ScopeBase::activate_result_action().
+     \param metadata The metadata received by ScopeBase::activate_result_action().
+     \param action_id The action identifier received by ScopeBase::activate_result_action().
+    */
+    ActivationQueryBase(Result const& update_result, ActionMetadata const& metadata, std::string const& action_id);
+
+    /**
      \brief Called when the originator of the activation request cancelled it.
      */
     virtual void cancelled() override;

=== modified file 'include/unity/scopes/ActivationResponse.h'
--- include/unity/scopes/ActivationResponse.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/ActivationResponse.h	2015-06-09 10:03:04 +0000
@@ -20,6 +20,7 @@
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/Result.h>
 #include <memory>
 
 namespace unity
@@ -41,23 +42,25 @@
 {
 public:
     /**
-     \brief Status of a unity::scopes::ScopeBase::activate or unity::scopes::ScopeBase::perform_action request.
+     \brief Status of a unity::scopes::ScopeBase::activate, unity::scopes::ScopeBase::perform_action,
+     or unity::scopes::ScopeBase::activate_result_action request.
      */
     enum Status
     {
-        NotHandled,  /**< Activation of this result wasn't handled by the scope */
-        ShowDash,    /**< Activation of this result was handled, show the Dash */
-        HideDash,    /**< Activation of this result was handled, hide the Dash */
-        ShowPreview, /**< Preview should be requested for this result */
-        PerformQuery /**< Perform new search. This state is implied if creating ActivationResponse with CannedQuery object and is invalid otherwise */
+        NotHandled,   /**< Activation of this result wasn't handled by the scope */
+        ShowDash,     /**< Activation of this result was handled, show the Dash */
+        HideDash,     /**< Activation of this result was handled, hide the Dash */
+        ShowPreview,  /**< Preview should be requested for this result */
+        PerformQuery, /**< Perform new search. This state is implied if creating ActivationResponse with CannedQuery object and is invalid otherwise */
+        UpdateResult, /**< Update the result. This state is implied if creating ActivationResponse with Result object and is invalid otherwise */
     };
 
     /**
     \brief Creates ActivationResponse with given status.
     \param status The activation status.
-    \throws unity::InvalidArgumentException if status is Status::PerformQuery. To
-    create an ActivationResponse of that type, use the ActivationResponse(CannedQuery const&)
-    constructor.
+    \throws unity::InvalidArgumentException if status is Status::PerformQuery or Status::Update.
+    To create an ActivationResponse for one of these types, use the ActivationResponse(CannedQuery const&)
+    or ActivationResponse(Result const&) constructors.
     */
     ActivationResponse(Status status);
 
@@ -67,6 +70,13 @@
      */
     ActivationResponse(CannedQuery const& query);
 
+    /**
+    \brief Creates an ActivationResponse with status Status::UpdateResult and an updated result that
+    replaces the original result of the action.
+    \param updated_result The updated result to replace the original result of the action.
+     */
+    ActivationResponse(Result const& updated_result);
+
     /**@name Copy and assignment
     Copy and assignment operators (move and non-move versions) have the usual value semantics.
     */
@@ -88,13 +98,13 @@
      \brief Attach arbitrary data to this response.
 
      The attached data is sent back to the scope if the status of this response is Status::ShowPreview.
-     \param data arbitrary value attached to response
+     \param data An arbitrary value attached to the response.
      */
     void set_scope_data(Variant const& data);
 
     /**
      \brief Get data attached to this response object.
-     \return The data attached to response.
+     \return The data attached to the response.
      */
     Variant scope_data() const;
 
@@ -106,6 +116,14 @@
     */
     CannedQuery query() const;
 
+    /**
+     \brief The updated result if status is Status::UpdateResult.
+
+     \throws unity::LogicException if the status of this ActivationResponse is anything other than Status::UpdateResult.
+     \return The result to be displayed instead of the original result.
+    */
+    Result updated_result() const;
+
     /// @cond
     VariantMap serialize() const;
 

=== modified file 'include/unity/scopes/Scope.h'
--- include/unity/scopes/Scope.h	2015-04-09 15:59:17 +0000
+++ include/unity/scopes/Scope.h	2015-06-09 10:03:04 +0000
@@ -54,10 +54,10 @@
     Results for the query may begin to arrive only after search() completes (but may
     also arrive while search() is still running).
 
-    \param query_string search string
-    \param metadata additional data to pass to scope
-    \param reply The callback object to receive replies
-    \return A proxy that permits cancellation of this request
+    \param query_string The search string.
+    \param metadata Additional data to pass to the scope.
+    \param reply The callback object to receive replies.
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy search(std::string const& query_string,
                                   SearchMetadata const& metadata,
@@ -68,11 +68,11 @@
 
     This method has same synopsis as previous method, but it takes additional unity::scopes::FilterState argument.
 
-    \param query_string search string
-    \param filter_state state of filters
-    \param metadata additional data to pass to scope
-    \param reply The callback object to receive replies
-    \return A proxy that permits cancellation of this request
+    \param query_string The search string.
+    \param filter_state The state of filters.
+    \param metadata Additional data to pass to the scope.
+    \param reply The callback object to receive replies.
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy search(std::string const& query_string,
                                   FilterState const& filter_state,
@@ -84,12 +84,12 @@
 
     This method has same synopsis as previous method, but it takes additional department identifier argument.
 
-    \param query_string search string
-    \param department_id identifier of a department to search
-    \param filter_state state of filters
-    \param metadata additional data to pass to scope
-    \param reply The callback object to receive replies
-    \return query handler
+    \param query_string The search string.
+    \param department_id The identifier of a department to search.
+    \param filter_state The state of filters.
+    \param metadata Additional data to pass to the scope.
+    \param reply The callback object to receive replies.
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy search(std::string const& query_string,
                                   std::string const& department_id,
@@ -99,10 +99,10 @@
 
     /**
     \brief Initiates activation of a search result.
-    \param result activated result
-    \param metadata additional data to pass to scope
+    \param result The result that was activated.
+    \param metadata Additional data to pass to the scope.
     \param reply The callback object to receive replies
-    \return A proxy that permits cancellation of this request
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy activate(Result const& result,
                                     ActionMetadata const& metadata,
@@ -110,12 +110,12 @@
 
     /**
     \brief Initiates activation of a preview action.
-    \param result Result that was previewed.
-    \param metadata additional data to pass to scope
-    \param widget_id identifier of 'actions' widget of activated action
-    \param action_id identifier of an action to activate
+    \param result The result that was previewed.
+    \param metadata Additional data to pass to the scope.
+    \param widget_id The identifier of the 'actions' widget of the activated action.
+    \param action_id The identifier of an action to activate.
     \param reply The callback object to receive replies
-    \return A proxy that permits cancellation of this request
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy perform_action(Result const& result,
                                           ActionMetadata const& metadata,
@@ -125,10 +125,10 @@
 
     /**
     \brief Initiates preview request.
-    \param result Result to be previewed
-    \param metadata additional data to pass to scope
-    \param reply The callback object to receive replies
-    \return A proxy that permits cancellation of this request
+    \param result The result to be previewed.
+    \param metadata Additional data to pass to the scope.
+    \param reply The callback object to receive replies.
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy preview(Result const& result,
                                    ActionMetadata const& metadata,
@@ -161,13 +161,13 @@
 
     This method has same synopsis as previous search method, but it takes additional user_data argument.
 
-    \param query_string search string
-    \param department_id identifier of a department to search
-    \param filter_state state of filters
-    \param user_data arbitrary data
-    \param metadata additional data to pass to scope
+    \param query_string The search string.
+    \param department_id The identifier of a department to search.
+    \param filter_state The state of filters.
+    \param user_data Arbitrary data.
+    \param metadata Additional data to pass to the scope.
     \param reply The callback object to receive replies
-    \return query handler
+    \return A proxy that permits cancellation of this request.
     */
     virtual QueryCtrlProxy search(std::string const& query_string,
                                   std::string const& department_id,
@@ -176,6 +176,19 @@
                                   SearchMetadata const& metadata,
                                   SearchListenerBase::SPtr const& reply) = 0;
 
+    /**
+    \brief Initiates activation of a result (in-card) action.
+    \param result The result that was was activated.
+    \param metadata Additional data to pass to the scope.
+    \param action_id The identifier of the action.
+    \param reply The callback object to receive replies
+    \return A proxy that permits cancellation of this request.
+    */
+    virtual QueryCtrlProxy activate_result_action(Result const& result,
+            ActionMetadata const& metadata,
+            std::string const& action_id,
+            ActivationListenerBase::SPtr const& reply) = 0;
+
 protected:
     /// @cond
     Scope();

=== modified file 'include/unity/scopes/ScopeBase.h'
--- include/unity/scopes/ScopeBase.h	2015-04-09 15:59:17 +0000
+++ include/unity/scopes/ScopeBase.h	2015-06-09 10:03:04 +0000
@@ -357,6 +357,24 @@
     */
     virtual ChildScopeList child_scopes() const final;
 
+    /**
+    \brief Invoked when a scope is requested to handle a result in-card action.
+
+    This method must return an instance that is derived from `ActivationQueryBase`. The implementation
+    of this method must return in a timely manner, that is, it should perform only minimal
+    initialization that is guaranteed to complete quickly. The call to activate_result_action() is made
+    by an arbitrary thread.
+    The default implementation returns an instance of ActivationQueryBase that responds with
+    ActivationResponse::Status::NotHandled.
+    \param result The result whose action was activated.
+    \param metadata Additional data sent by the client.
+    \param action_id The identifier of the action that was activated.
+    \return The activation instance.
+    */
+    virtual ActivationQueryBase::UPtr activate_result_action(Result const& result,
+            ActionMetadata const& metadata,
+            std::string const& action_id);
+
 protected:
     /// @cond
     ScopeBase();

=== modified file 'include/unity/scopes/internal/ActivationResponseImpl.h'
--- include/unity/scopes/internal/ActivationResponseImpl.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/ActivationResponseImpl.h	2015-06-09 10:03:04 +0000
@@ -20,6 +20,7 @@
 
 #include <unity/scopes/ActivationResponse.h>
 #include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/Result.h>
 
 namespace unity
 {
@@ -30,12 +31,15 @@
 namespace internal
 {
 
+class RuntimeImpl;
+
 class ActivationResponseImpl final
 {
 public:
     ActivationResponseImpl(ActivationResponse::Status status);
     ActivationResponseImpl(CannedQuery const& query);
-    ActivationResponseImpl(VariantMap const& var);
+    ActivationResponseImpl(Result const& result);
+    ActivationResponseImpl(VariantMap const& var, RuntimeImpl const* runtime);
     ~ActivationResponseImpl() = default;
 
     ActivationResponseImpl(ActivationResponseImpl const& other) = default;
@@ -47,15 +51,17 @@
     void set_scope_data(Variant const& hints);
     Variant scope_data() const;
     CannedQuery query() const;
+    Result updated_result() const;
 
     VariantMap serialize() const;
 
-    static ActivationResponse create(VariantMap const& var);
+    static ActivationResponse create(VariantMap const& var, RuntimeImpl const *runtime);
 
 private:
     ActivationResponse::Status status_;
     CannedQuery::SPtr query_;
     Variant scope_data_;
+    Result::SPtr updated_result_;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2015-03-02 03:59:01 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2015-06-09 10:03:04 +0000
@@ -46,12 +46,13 @@
 
 static constexpr char const* DFLT_SS_SCOPE_IDENTITY = "SmartScope";
 
-static constexpr int DFLT_REAP_EXPIRY = 45;              // seconds
-static constexpr int DFLT_REAP_INTERVAL = 10;            // seconds
-static constexpr int DFLT_PROCESS_TIMEOUT = 4000;        // milliseconds
-static constexpr int DFLT_ZMQ_TWOWAY_TIMEOUT = 500;      // milliseconds
-static constexpr int DFLT_ZMQ_LOCATE_TIMEOUT = 5000;     // milliseconds
-static constexpr int DFLT_ZMQ_REGISTRY_TIMEOUT = 5000;   // milliseconds
+static constexpr int DFLT_REAP_EXPIRY = 45;                // seconds
+static constexpr int DFLT_REAP_INTERVAL = 10;              // seconds
+static constexpr int DFLT_PROCESS_TIMEOUT = 4000;          // milliseconds
+static constexpr int DFLT_ZMQ_TWOWAY_TIMEOUT = 500;        // milliseconds
+static constexpr int DFLT_ZMQ_LOCATE_TIMEOUT = 5000;       // milliseconds
+static constexpr int DFLT_ZMQ_REGISTRY_TIMEOUT = 5000;     // milliseconds
+static constexpr int DFLT_ZMQ_CHILDSCOPES_TIMEOUT = 2000;  // milliseconds
 
 static constexpr char const* DFLT_HOME_CACHE_SUBDIR = ".local/share/unity-scopes";
 static constexpr char const* DFLT_HOME_APP_SUBDIR = ".local/share";

=== modified file 'include/unity/scopes/internal/MWScope.h'
--- include/unity/scopes/internal/MWScope.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/MWScope.h	2015-06-09 10:03:04 +0000
@@ -64,6 +64,11 @@
 
     virtual bool debug_mode() = 0;
 
+    virtual QueryCtrlProxy activate_result_action(VariantMap const& result,
+                                                  VariantMap const& hints,
+                                                  std::string const& action_id,
+                                                  MWReplyProxy const& reply) = 0;
+
 protected:
     MWScope(MiddlewareBase* mw_base);
 };

=== modified file 'include/unity/scopes/internal/ReplyObject.h'
--- include/unity/scopes/internal/ReplyObject.h	2015-02-04 05:45:25 +0000
+++ include/unity/scopes/internal/ReplyObject.h	2015-06-09 10:03:04 +0000
@@ -60,6 +60,9 @@
     void finished(CompletionDetails const& details) noexcept override;
     void info(OperationInfo const& op_info) noexcept override;
 
+protected:
+    RuntimeImpl const* runtime() const;
+
 private:
     RuntimeImpl const* runtime_;
     ListenerBase::SPtr listener_base_;

=== modified file 'include/unity/scopes/internal/ResultImpl.h'
--- include/unity/scopes/internal/ResultImpl.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/ResultImpl.h	2015-06-09 10:03:04 +0000
@@ -84,6 +84,7 @@
     // a public static method, so there's access to the private constructor
     // without the need to define too many classes as friends
     static Result create_result(VariantMap const&);
+    static Result create_result(ResultImpl *impl);
 
 protected:
     virtual void serialize_internal(VariantMap& var) const;

=== modified file 'include/unity/scopes/internal/ResultReplyObject.h'
--- include/unity/scopes/internal/ResultReplyObject.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/ResultReplyObject.h	2015-06-09 10:03:04 +0000
@@ -45,7 +45,6 @@
 private:
     SearchListenerBase::SPtr const receiver_;
     std::shared_ptr<CategoryRegistry> cat_registry_;
-    RuntimeImpl const* runtime_;
     std::atomic_int cardinality_;
     std::atomic_int num_pushes_;
 };

=== modified file 'include/unity/scopes/internal/ScopeImpl.h'
--- include/unity/scopes/internal/ScopeImpl.h	2015-04-09 15:59:17 +0000
+++ include/unity/scopes/internal/ScopeImpl.h	2015-06-09 10:03:04 +0000
@@ -100,6 +100,11 @@
                                    ActionMetadata const& hints,
                                    PreviewListenerBase::SPtr const& reply) override;
 
+    virtual QueryCtrlProxy activate_result_action(Result const& result,
+                                                  ActionMetadata const& metadata,
+                                                  std::string const& action_id,
+                                                  ActivationListenerBase::SPtr const& reply);
+
     virtual ChildScopeList child_scopes() override;
     virtual bool set_child_scopes(ChildScopeList const& child_scopes) override;
 

=== modified file 'include/unity/scopes/internal/ScopeObject.h'
--- include/unity/scopes/internal/ScopeObject.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/ScopeObject.h	2015-06-09 10:03:04 +0000
@@ -82,6 +82,12 @@
 
     virtual bool debug_mode() const override;
 
+    virtual MWQueryCtrlProxy activate_result_action(Result const& result,
+                                                    ActionMetadata const& hints,
+                                                    std::string const& action_id,
+                                                    MWReplyProxy const &reply,
+                                                    InvokeInfo const& info) override;
+
 private:
     MWQueryCtrlProxy query(MWReplyProxy const& reply, MiddlewareBase* mw_base,
         std::string const& method,

=== modified file 'include/unity/scopes/internal/ScopeObjectBase.h'
--- include/unity/scopes/internal/ScopeObjectBase.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/ScopeObjectBase.h	2015-06-09 10:03:04 +0000
@@ -73,6 +73,12 @@
     virtual bool set_child_scopes(ChildScopeList const& child_scopes) = 0;
 
     virtual bool debug_mode() const = 0;
+
+    virtual MWQueryCtrlProxy activate_result_action(Result const& result,
+                                            ActionMetadata const& hints,
+                                            std::string const& action_id,
+                                            MWReplyProxy const& reply,
+                                            InvokeInfo const& info) = 0;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h'
--- include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h	2015-01-16 06:13:57 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h	2015-06-09 10:03:04 +0000
@@ -30,7 +30,7 @@
 {
 namespace http
 {
-class Client;
+class StreamingClient;
 }
 }
 }
@@ -63,7 +63,7 @@
     void cancel_get(unsigned int session_id) override;
 
     unsigned int no_reply_timeout;
-    std::shared_ptr<core::net::http::Client> client;
+    std::shared_ptr<core::net::http::StreamingClient> client;
     std::thread worker;
 };
 

=== modified file 'include/unity/scopes/internal/smartscopes/SSScopeObject.h'
--- include/unity/scopes/internal/smartscopes/SSScopeObject.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/smartscopes/SSScopeObject.h	2015-06-09 10:03:04 +0000
@@ -79,6 +79,12 @@
 
     bool debug_mode() const override;
 
+    MWQueryCtrlProxy activate_result_action(Result const& result,
+                                            ActionMetadata const& hints,
+                                            std::string const& action_id,
+                                            MWReplyProxy const& reply,
+                                            InvokeInfo const& info) override;
+
 private:
     MWQueryCtrlProxy query(InvokeInfo const& info,
                            MWReplyProxy const& reply,

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScope.h'
--- include/unity/scopes/internal/smartscopes/SmartScope.h	2014-11-18 07:04:04 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScope.h	2015-06-09 10:03:04 +0000
@@ -92,6 +92,7 @@
     QueryBase::UPtr preview(std::string const& scope_id, Result const& result, ActionMetadata const& hints);
     ActivationQueryBase::UPtr activate(std::string const&, Result const& result, ActionMetadata const& metadata);
     ActivationQueryBase::UPtr perform_action(std::string const& scope_id, Result const& result, ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id);
+    ActivationQueryBase::UPtr activate_result_action(std::string const& scope_id, Result const& result, ActionMetadata const& metadata, std::string const& action_id);
 
 private:
     SSRegistryObject::SPtr reg_;

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScopesClient.h'
--- include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2015-01-28 09:03:59 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2015-06-09 10:03:04 +0000
@@ -215,8 +215,10 @@
     std::shared_ptr<DepartmentInfo> parse_departments(JsonNodeInterface::SPtr node);
     Filters parse_filters(JsonNodeInterface::SPtr node);
     FilterState parse_filter_state(JsonNodeInterface::SPtr node);
-    void parse_line(std::string const& json, SearchReplyHandler const& handler);
-    void parse_line(std::string const& json, PreviewReplyHandler const& handler);
+
+    std::string handle_chunk(const std::string& chunk, std::function<void(const std::string&)> line_handler);
+    void handle_line(std::string const& json, SearchReplyHandler const& handler);
+    void handle_line(std::string const& json, PreviewReplyHandler const& handler);
 
     std::vector<std::string> extract_json_stream(std::string const& json_stream);
 

=== modified file 'include/unity/scopes/internal/zmq_middleware/ScopeI.h'
--- include/unity/scopes/internal/zmq_middleware/ScopeI.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/zmq_middleware/ScopeI.h	2015-06-09 10:03:04 +0000
@@ -53,6 +53,9 @@
     virtual void preview_(Current const& current,
                           capnp::AnyPointer::Reader& in_params,
                           capnproto::Response::Builder& r);
+    virtual void activate_result_action_(Current const& current,
+                           capnp::AnyPointer::Reader& in_params,
+                           capnproto::Response::Builder& r);
     virtual void child_scopes_(Current const& current,
                           capnp::AnyPointer::Reader& in_params,
                           capnproto::Response::Builder& r);

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqConfig.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2015-06-09 10:03:04 +0000
@@ -39,6 +39,7 @@
     int twoway_timeout() const;
     int locate_timeout() const;
     int registry_timeout() const;
+    int child_scopes_timeout() const;
     std::string registry_endpoint_dir() const;
     std::string ss_registry_endpoint_dir() const;
 
@@ -47,6 +48,7 @@
     int twoway_timeout_;
     int locate_timeout_;
     int registry_timeout_;
+    int child_scopes_timeout_;
     std::string registry_endpoint_dir_;
     std::string ss_registry_endpoint_dir_;
 };

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-12-04 03:33:59 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2015-06-09 10:03:04 +0000
@@ -94,6 +94,7 @@
     ThreadPool* twoway_pool();
     int64_t locate_timeout() const noexcept;
     int64_t registry_timeout() const noexcept;
+    int64_t child_scopes_timeout() const noexcept;
 
 private:
     ObjectProxy make_typed_proxy(std::string const& endpoint,
@@ -138,6 +139,7 @@
     int64_t twoway_timeout_;                    // Default timeout for twoway invocations
     int64_t locate_timeout_;                    // Timeout for registry locate()
     int64_t registry_timeout_;                  // Timeout for registry operations other than locate()
+    int64_t child_scopes_timeout_;              // Timeout for child_scopes() and set_child_scopes() methods
 
     std::string public_endpoint_dir_;
     std::string private_endpoint_dir_;

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqScope.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2015-03-25 05:52:25 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2015-06-09 10:03:04 +0000
@@ -68,8 +68,14 @@
 
     virtual bool debug_mode() override;
 
+    virtual QueryCtrlProxy activate_result_action(VariantMap const& result,
+                                                  VariantMap const& hints,
+                                                  std::string const& action_id,
+                                                  MWReplyProxy const& reply) override;
+
 private:
     ZmqObjectProxy::TwowayOutParams invoke_scope_(capnp::MessageBuilder& in_params);
+    ZmqObjectProxy::TwowayOutParams invoke_scope_(capnp::MessageBuilder& in_params, int64_t timeout);
     std::mutex debug_mode_mutex_;
     std::unique_ptr<bool> debug_mode_;
 };

=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2015-04-09 15:59:17 +0000
+++ include/unity/scopes/testing/MockScope.h	2015-06-09 10:03:04 +0000
@@ -76,6 +76,10 @@
                                         SearchListenerBase::SPtr const&));
 
     MOCK_METHOD1(set_child_scopes, bool(ChildScopeList const&));
+    MOCK_METHOD4(activate_result_action, QueryCtrlProxy(unity::scopes::Result const&,
+                                                        ActionMetadata const&,
+                                                        std::string const&,
+                                                        ActivationListenerBase::SPtr const&));
 };
 
 /// @endcond

=== modified file 'src/scopes/ActivationQueryBase.cpp'
--- src/scopes/ActivationQueryBase.cpp	2014-06-18 10:06:47 +0000
+++ src/scopes/ActivationQueryBase.cpp	2015-06-09 10:03:04 +0000
@@ -37,6 +37,11 @@
 {
 }
 
+ActivationQueryBase::ActivationQueryBase(Result const& update_result, ActionMetadata const& metadata, std::string const& action_id) :
+    QueryBase(new internal::ActivationQueryBaseImpl(update_result, metadata, "", action_id))
+{
+}
+
 ActivationQueryBase::~ActivationQueryBase()
 {
 }

=== modified file 'src/scopes/ActivationResponse.cpp'
--- src/scopes/ActivationResponse.cpp	2014-02-27 16:58:50 +0000
+++ src/scopes/ActivationResponse.cpp	2015-06-09 10:03:04 +0000
@@ -36,6 +36,11 @@
 {
 }
 
+ActivationResponse::ActivationResponse(Result const& updated_result)
+    : p(new internal::ActivationResponseImpl(updated_result))
+{
+}
+
 /// @cond
 ActivationResponse::ActivationResponse(internal::ActivationResponseImpl* pimpl)
     : p(pimpl)
@@ -88,6 +93,11 @@
     return p->query();
 }
 
+Result ActivationResponse::updated_result() const
+{
+    return p->updated_result();
+}
+
 } // namespace scopes
 
 } // namespace unity

=== modified file 'src/scopes/PreviewWidget.cpp'
--- src/scopes/PreviewWidget.cpp	2015-02-24 10:45:11 +0000
+++ src/scopes/PreviewWidget.cpp	2015-06-09 10:03:04 +0000
@@ -90,6 +90,7 @@
 \arg \c progress
 \arg \c text
 \arg \c rating-input
+\arg \c rating-edit
 \arg \c reviews
 \arg \c expandable
 
@@ -319,6 +320,29 @@
 }
 \endcode
 
+\subsection rating-edit rating-edit widget
+
+The rating-edit widget allows users to edit an existing review and rating. When used in a preview, the widget displays an existing
+review and a small "pen" icon; user can update the review and/or rating after tapping the "pen" icon.
+
+This widget supports all the attributes of rating-input widget, plus three
+extra attributes (\c "review", \c "rating", \c "author") to pre-fill the widget with data of an existing review.
+
+List of attributes:
+
+\arg \c rating-label String for the star-based rating (default: "Rate this")
+\arg \c review-label String for the review input (default: "Add a review")
+\arg \c submit-label String for the confirmation button (default: "Send")
+\arg \c rating-icon-empty URI for an empty rating icon
+\arg \c rating-icon-full URI for a full rating icon
+\arg \c visible String specifying which of the two widgets are visible (\c "rating", \c "review" or default:\c "both")
+\arg \c required String specifying which of the two widgets are required to be filled in (\c "rating", \c "review" or default:\c "both")
+\arg \c author String for the name of the reviewer (optional)
+\arg \c review String for the text of existing review (optional)
+\arg \c rating Number for the rating value (optional)
+
+Note: The rating-edit widget may not be supported by older versions of unity8 shell.
+
 \subsection reviews reviews widget
 
 The reviews widget is used to display previously-rated content.

=== modified file 'src/scopes/ScopeBase.cpp'
--- src/scopes/ScopeBase.cpp	2015-03-25 05:52:25 +0000
+++ src/scopes/ScopeBase.cpp	2015-06-09 10:03:04 +0000
@@ -65,6 +65,13 @@
     return ActivationQueryBase::UPtr(new ActivationQueryBase(result, metadata, widget_id, action_id)); // default impl returns NotHandled
 }
 
+ActivationQueryBase::UPtr ScopeBase::activate_result_action(Result const& result,
+            ActionMetadata const& metadata,
+            std::string const& action_id)
+{
+    return ActivationQueryBase::UPtr(new ActivationQueryBase(result, metadata, action_id)); // default impl returns NotHandled
+}
+
 void ScopeBase::runtime_version(int& v_major, int& v_minor, int& v_micro) noexcept
 {
     v_major = unity::scopes::major_version();

=== modified file 'src/scopes/internal/ActivationReplyObject.cpp'
--- src/scopes/internal/ActivationReplyObject.cpp	2014-08-12 09:04:49 +0000
+++ src/scopes/internal/ActivationReplyObject.cpp	2015-06-09 10:03:04 +0000
@@ -40,7 +40,7 @@
 
 bool ActivationReplyObject::process_data(VariantMap const& data)
 {
-    ActivationResponse resp = ActivationResponseImpl::create(data);
+    ActivationResponse resp = ActivationResponseImpl::create(data, runtime());
     receiver_->activated(resp);
     return false;
 }

=== modified file 'src/scopes/internal/ActivationResponseImpl.cpp'
--- src/scopes/internal/ActivationResponseImpl.cpp	2014-02-27 16:58:50 +0000
+++ src/scopes/internal/ActivationResponseImpl.cpp	2015-06-09 10:03:04 +0000
@@ -19,6 +19,7 @@
 #include <unity/scopes/internal/ActivationResponseImpl.h>
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/internal/CannedQueryImpl.h>
+#include <unity/scopes/internal/ResultImpl.h>
 #include <cassert>
 
 namespace unity
@@ -37,6 +38,10 @@
     {
         throw unity::InvalidArgumentException("ActivationResponse(): Status::PerformQuery allowed only with CannedQuery object");
     }
+    if (status == ActivationResponse::Status::UpdateResult)
+    {
+        throw unity::InvalidArgumentException("ActivationResponse(): Status::UpdateResult allowed only with Result object");
+    }
 }
 
 ActivationResponseImpl::ActivationResponseImpl(CannedQuery const& query)
@@ -45,7 +50,13 @@
 {
 }
 
-ActivationResponseImpl::ActivationResponseImpl(VariantMap const& var)
+ActivationResponseImpl::ActivationResponseImpl(Result const& updated_result)
+    : status_(ActivationResponse::Status::UpdateResult),
+      updated_result_(std::make_shared<Result>(updated_result))
+{
+}
+
+ActivationResponseImpl::ActivationResponseImpl(VariantMap const& var, RuntimeImpl const* runtime)
 {
     auto it = var.find("scope_data");
     if (it == var.end())
@@ -70,6 +81,17 @@
         }
         query_ = std::make_shared<CannedQuery>(CannedQueryImpl::create(it->second.get_dict()));
     }
+    else if (status_ == ActivationResponse::Status::UpdateResult)
+    {
+        it = var.find("updated_result");
+        if (it == var.end())
+        {
+            throw LogicException("ActivationResponseImpl(): Invalid data, missing 'updated_result'");
+        }
+        auto impl = new ResultImpl(it->second.get_dict());
+        impl->set_runtime(runtime);
+        updated_result_ = std::make_shared<Result>(ResultImpl::create_result(impl));
+    }
 }
 
 ActivationResponse::Status ActivationResponseImpl::status() const
@@ -97,6 +119,16 @@
     throw LogicException("ActivationResponse::query(): query is only available for status of Status::PerformQuery");
 }
 
+Result ActivationResponseImpl::updated_result() const
+{
+    if (updated_result_)
+    {
+        assert(status_ == ActivationResponse::Status::UpdateResult);
+        return *updated_result_;
+    }
+    throw LogicException("ActivationResponse::updated_result(): updated result is only available for status of Status::UpdateResult");
+}
+
 VariantMap ActivationResponseImpl::serialize() const
 {
     VariantMap vm;
@@ -106,12 +138,16 @@
     {
         vm["query"] = query_->serialize();
     }
+    if (updated_result_)
+    {
+        vm["updated_result"] = updated_result_->serialize();
+    }
     return vm;
 }
 
-ActivationResponse ActivationResponseImpl::create(VariantMap const& var)
+ActivationResponse ActivationResponseImpl::create(VariantMap const& var, RuntimeImpl const* runtime)
 {
-    return ActivationResponse(new ActivationResponseImpl(var));
+    return ActivationResponse(new ActivationResponseImpl(var, runtime));
 }
 
 } // namespace internal

=== modified file 'src/scopes/internal/ReplyObject.cpp'
--- src/scopes/internal/ReplyObject.cpp	2015-02-04 05:45:25 +0000
+++ src/scopes/internal/ReplyObject.cpp	2015-06-09 10:03:04 +0000
@@ -232,6 +232,11 @@
     return origin_proxy_;
 }
 
+RuntimeImpl const* ReplyObject::runtime() const
+{
+    return runtime_;
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ResultImpl.cpp'
--- src/scopes/internal/ResultImpl.cpp	2014-05-15 22:42:47 +0000
+++ src/scopes/internal/ResultImpl.cpp	2015-06-09 10:03:04 +0000
@@ -479,6 +479,11 @@
     return Result(variant_map);
 }
 
+Result ResultImpl::create_result(ResultImpl *impl)
+{
+    return Result(impl);
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ResultReplyObject.cpp'
--- src/scopes/internal/ResultReplyObject.cpp	2015-01-09 03:16:51 +0000
+++ src/scopes/internal/ResultReplyObject.cpp	2015-06-09 10:03:04 +0000
@@ -49,7 +49,6 @@
     ReplyObject(std::static_pointer_cast<ListenerBase>(receiver), runtime, scope_id, dont_reap),
     receiver_(receiver),
     cat_registry_(new CategoryRegistry()),
-    runtime_(runtime),
     cardinality_(cardinality),
     num_pushes_(0)
 {
@@ -113,7 +112,7 @@
         auto result_var = it->second.get_dict();
         auto impl = std::unique_ptr<internal::CategorisedResultImpl>(new internal::CategorisedResultImpl(*cat_registry_, result_var));
 
-        impl->set_runtime(runtime_);
+        impl->set_runtime(runtime());
         // set result origin
         if (impl->origin().empty())
         {

=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2015-01-28 05:31:24 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2015-06-09 10:03:04 +0000
@@ -23,6 +23,8 @@
 #include <unity/UnityExceptions.h>
 #include <unity/scopes/internal/Utils.h>
 
+#include <boost/algorithm/string/trim.hpp>
+
 #include <algorithm>
 #include <sstream>
 #include <string>
@@ -48,14 +50,14 @@
     const string art_key = "Art";
     const string icon_key = "Icon";
     const string search_hint_key = "SearchHint";
-    const string hot_key_key = "HotKey";
-    const string invisible_key = "Invisible";
+    const string hot_key_key = "HotKey";                            // Undocumented, currently unused
+    const string invisible_key = "Invisible";                       // Deliberately undocumented
     const string location_data_needed_key = "LocationDataNeeded";
     const string scoperunner_key = "ScopeRunner";
     const string idle_timeout_key = "IdleTimeout";
     const string results_ttl_key = "ResultsTtlType";
-    const string debug_mode_key = "DebugMode";
-    const string child_scope_ids_key = "ChildScopes";
+    const string debug_mode_key = "DebugMode";                      // Deliberately undocumented
+    const string child_scope_ids_key = "ChildScopes";               // Deprecated
     const string version_key = "Version";
     const string keywords_key = "Keywords";
     const string is_aggregator_key = "IsAggregator";
@@ -87,8 +89,25 @@
     }
 
     display_name_ = parser()->get_locale_string(scope_config_group, scope_name_key);
+    boost::trim(display_name_);
+    if (display_name_.empty())
+    {
+        throw_ex(scope_name_key + " cannot be empty or whitespace only");
+    }
+
     description_ = parser()->get_locale_string(scope_config_group, description_key);
+    boost::trim(description_);
+    if (description_.empty())
+    {
+        throw_ex(description_key + " cannot be empty or whitespace only");
+    }
+
     author_ = parser()->get_string(scope_config_group, author_key);
+    boost::trim(author_);
+    if (author_.empty())
+    {
+        throw_ex(author_key + " cannot be empty or whitespace only");
+    }
 
     // For optional values, we store them in a unique_ptr so we can distinguish the "not set at all" case
     // from the "explicitly set to empty string" case. parser()->get_string throws LogicException if
@@ -162,7 +181,6 @@
                  ": value must be >= 0 and <= " + std::to_string(max_idle_timeout));
     }
 
-
     results_ttl_type_ = ScopeMetadata::ResultsTtlType::None;
     try
     {

=== modified file 'src/scopes/internal/ScopeImpl.cpp'
--- src/scopes/internal/ScopeImpl.cpp	2015-05-26 08:23:16 +0000
+++ src/scopes/internal/ScopeImpl.cpp	2015-06-09 10:03:04 +0000
@@ -338,6 +338,55 @@
     return ctrl;
 }
 
+QueryCtrlProxy ScopeImpl::activate_result_action(Result const& result,
+                                      ActionMetadata const& metadata,
+                                      std::string const& action_id,
+                                      ActivationListenerBase::SPtr const& reply)
+{
+    if (reply == nullptr)
+    {
+        throw unity::InvalidArgumentException("Scope::activate_result_action(): invalid ActivationListenerBase (nullptr)");
+    }
+
+    ReplyObject::SPtr ro(make_shared<ActivationReplyObject>(reply, runtime_, to_string(), fwd()->debug_mode()));
+    MWReplyProxy rp = fwd()->mw_base()->add_reply_object(ro);
+
+    shared_ptr<QueryCtrlImpl> ctrl = make_shared<QueryCtrlImpl>(nullptr, rp);
+
+    auto impl = dynamic_pointer_cast<ScopeImpl>(shared_from_this());
+
+    auto send_activate_action = [impl, result, metadata, action_id, rp, ro, ctrl]() -> void
+    {
+        try
+        {
+            auto real_ctrl = dynamic_pointer_cast<QueryCtrlImpl>(impl->fwd()->activate_result_action(
+                                                                               result.p->activation_target(),
+                                                                               metadata.serialize(),
+                                                                               action_id,
+                                                                               rp));
+            assert(real_ctrl);
+
+            auto new_proxy = dynamic_pointer_cast<MWQueryCtrl>(real_ctrl->proxy());
+            assert(new_proxy);
+            ctrl->set_proxy(new_proxy);
+        }
+        catch (std::exception const& e)
+        {
+            try
+            {
+                ro->finished(CompletionDetails(CompletionDetails::Error, e.what()));
+            }
+            catch (...)
+            {
+            }
+        }
+    };
+
+    auto future = runtime_->async_pool()->submit(send_activate_action);
+    runtime_->future_queue()->push(move(future));
+    return ctrl;
+}
+
 ChildScopeList ScopeImpl::child_scopes()
 {
     return fwd()->child_scopes();

=== modified file 'src/scopes/internal/ScopeObject.cpp'
--- src/scopes/internal/ScopeObject.cpp	2015-05-26 08:23:16 +0000
+++ src/scopes/internal/ScopeObject.cpp	2015-06-09 10:03:04 +0000
@@ -239,6 +239,26 @@
     );
 }
 
+MWQueryCtrlProxy ScopeObject::activate_result_action(Result const& result,
+                                                    ActionMetadata const& hints,
+                                                    std::string const& action_id,
+                                                    MWReplyProxy const &reply,
+                                                    InvokeInfo const& info)
+{
+    return query(reply,
+                 info.mw,
+                 "activate_result_action",
+                 [&result, &hints, &action_id, this]() -> QueryBase::SPtr {
+                     return this->scope_base_->activate_result_action(result, hints, action_id);
+                 },
+                 [&reply, this](QueryBase::SPtr query_base, MWQueryCtrlProxy ctrl_proxy) -> QueryObjectBase::SPtr {
+                     auto activation_base = dynamic_pointer_cast<ActivationQueryBase>(query_base);
+                     assert(activation_base);
+                     return make_shared<ActivationQueryObject>(activation_base, reply, ctrl_proxy);
+                 }
+    );
+}
+
 MWQueryCtrlProxy ScopeObject::preview(Result const& result,
                                       ActionMetadata const& hints,
                                       MWReplyProxy const& reply,

=== modified file 'src/scopes/internal/SettingsDB.cpp'
--- src/scopes/internal/SettingsDB.cpp	2015-03-02 03:59:01 +0000
+++ src/scopes/internal/SettingsDB.cpp	2015-06-09 10:03:04 +0000
@@ -348,6 +348,10 @@
 
             if (thread_state_ == Idle)
             {
+                if (thread_.joinable()) {
+                    thread_.join();
+                }
+
                 thread_state_ = Running;
                 thread_ = thread(&SettingsDB::watch_thread, this);
             }

=== modified file 'src/scopes/internal/smartscopes/HttpClientNetCpp.cpp'
--- src/scopes/internal/smartscopes/HttpClientNetCpp.cpp	2015-01-19 09:15:06 +0000
+++ src/scopes/internal/smartscopes/HttpClientNetCpp.cpp	2015-06-09 10:03:04 +0000
@@ -20,8 +20,8 @@
 
 #include <unity/UnityExceptions.h>
 
-#include <core/net/http/client.h>
-#include <core/net/http/request.h>
+#include <core/net/http/streaming_client.h>
+#include <core/net/http/streaming_request.h>
 #include <core/net/http/response.h>
 #include <core/net/http/status.h>
 
@@ -102,7 +102,7 @@
 
 HttpClientNetCpp::HttpClientNetCpp(unsigned int no_reply_timeout)
     : no_reply_timeout{no_reply_timeout},
-      client{http::make_client()},
+      client{http::make_streaming_client()},
       worker([this]() { client->run(); })
 {
 }
@@ -129,7 +129,7 @@
     }
     http_config.header = http_header;
 
-    auto request = client->get(http_config);
+    auto request = client->streaming_get(http_config);
     request->set_timeout(std::chrono::milliseconds{no_reply_timeout});
 
     auto promise = std::make_shared<std::promise<void>>();
@@ -157,12 +157,8 @@
                         }
                         else
                         {
-                            std::istringstream in(response.body);
-                            std::string line;
-                            while (std::getline(in, line))
-                            {
-                                line_data(line);
-                            }
+                            // call line_data with empty string to signal end of chunked data
+                            line_data("");
                             promise->set_value();
                         }
                     })
@@ -170,7 +166,11 @@
                     {
                         unity::ResourceException re(e.what());
                         promise->set_exception(std::make_exception_ptr(re));
-                    }));
+                    }),
+                [line_data](const std::string& const_data)
+                {
+                    line_data(const_data);
+                });
 
     return std::make_shared<HttpResponseHandle>(
                 shared_from_this(),

=== modified file 'src/scopes/internal/smartscopes/SSScopeObject.cpp'
--- src/scopes/internal/smartscopes/SSScopeObject.cpp	2015-03-25 05:52:25 +0000
+++ src/scopes/internal/smartscopes/SSScopeObject.cpp	2015-06-09 10:03:04 +0000
@@ -109,6 +109,20 @@
                      { qo_->add_query(SSQuery::Activation, query_base, reply); });
 }
 
+MWQueryCtrlProxy SSScopeObject::activate_result_action(Result const& result,
+                                                       ActionMetadata const& hints,
+                                                       std::string const& action_id,
+                                                       MWReplyProxy const& reply,
+                                                       InvokeInfo const& info)
+{
+    return query(info,
+                 reply,
+                 [&result, &hints, &info, &action_id, this ]()->QueryBase::SPtr
+                     { return this->smartscope_->activate_result_action(info.id, result, hints, action_id); },
+                 [&reply, &info, this](QueryBase::SPtr query_base)
+                     { qo_->add_query(SSQuery::Activation, query_base, reply); });
+}
+
 MWQueryCtrlProxy SSScopeObject::preview(Result const& result,
                                         ActionMetadata const& hints,
                                         MWReplyProxy const& reply,

=== modified file 'src/scopes/internal/smartscopes/SmartScope.cpp'
--- src/scopes/internal/smartscopes/SmartScope.cpp	2015-01-09 03:16:51 +0000
+++ src/scopes/internal/smartscopes/SmartScope.cpp	2015-06-09 10:03:04 +0000
@@ -50,18 +50,6 @@
 
 void SmartQuery::run(SearchReplyProxy const& reply)
 {
-    static const std::string no_net_hint("no-internet");
-    if (hints_.contains_hint(no_net_hint))
-    {
-        auto var = hints_[no_net_hint];
-        if (var.which() == Variant::Type::Bool && var.get_bool())
-        {
-            BOOST_LOG_SEV(ss_client_->logger(), Logger::Info)
-                << "SmartQuery(): networking disabled for remote scope " << scope_id_ << ", skipping";
-            return;
-        }
-    }
-
     struct FiltersHandler
     {
         FiltersHandler(SearchReplyProxy reply, std::string const& scope_id):
@@ -373,3 +361,12 @@
         << "SmartScope: created activation for \"" << scope_id << "\": \"" << result.uri() << "\"";
     return activation;
 }
+
+ActivationQueryBase::UPtr SmartScope::activate_result_action(std::string const& scope_id, Result const& result, ActionMetadata const& metadata, std::string const& action_id)
+{
+    // NOTE: there is no endpoint for it really, SmartActivation is a no-op (not-handled)
+    ActivationQueryBase::UPtr activation(new SmartActivation(result, metadata, "", action_id));
+    BOOST_LOG_SEV(ss_client_->logger(), Logger::Info)
+        << "SmartScope: created result action activation for \"" << scope_id << "\": \"" << result.uri() << "\", action_id=" << action_id;
+    return activation;
+}

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-04-10 03:55:25 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-06-09 10:03:04 +0000
@@ -472,18 +472,17 @@
         headers.push_back(std::make_pair("User-Agent", user_agent_hdr));
     }
 
-    auto reponse_mutex = std::make_shared<std::mutex>();
-    query_results_[search_id] = http_client_->get(search_uri.str(), [this, handler, reponse_mutex](std::string const& line_data)
+    auto tmp_data = std::make_shared<std::string>();
+    query_results_[search_id] = http_client_->get(search_uri.str(), [this, tmp_data, handler](std::string const& chunk)
     {
-        std::lock_guard<std::mutex> lock(*reponse_mutex);
-        try
-        {
-            parse_line(line_data, handler);
-        }
-        catch (std::exception const &e)
-        {
-            BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.search(): Failed to parse: " << e.what();
-        }
+        // prepend any leftover data from the previous handle_chunk call
+        std::string data = *tmp_data + (chunk.empty() ? "\n" : chunk);
+
+        // store the leftover data from the handle_chunk call into tmp_data
+        *tmp_data = handle_chunk(data, [this, handler](const std::string& line)
+        {
+            handle_line(line, handler);
+        });
     }, headers);
 
     return SearchHandle::UPtr(new SearchHandle(search_id, shared_from_this()));
@@ -540,24 +539,54 @@
 
     BOOST_LOG_SEV(logger_, Logger::Info) << "SmartScopesClient.preview(): GET " << preview_uri.str();
 
-    auto reponse_mutex = std::make_shared<std::mutex>();
-    query_results_[preview_id] = http_client_->get(preview_uri.str(), [this, handler, reponse_mutex](std::string const& line_data)
+    auto tmp_data = std::make_shared<std::string>();
+    query_results_[preview_id] = http_client_->get(preview_uri.str(), [this, tmp_data, handler](std::string const& chunk)
     {
-        std::lock_guard<std::mutex> lock(*reponse_mutex);
-        try
-        {
-            parse_line(line_data, handler);
-        }
-        catch (std::exception const &e)
-        {
-            BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.preview(): Failed to parse: " << e.what();
-        }
+        // prepend any leftover data from the previous handle_chunk call
+        std::string data = *tmp_data + (chunk.empty() ? "\n" : chunk);
+
+        // store the leftover data from the handle_chunk call into tmp_data
+        *tmp_data = handle_chunk(data, [this, handler](const std::string& line)
+        {
+            handle_line(line, handler);
+        });
     }, headers);
 
     return PreviewHandle::UPtr(new PreviewHandle(preview_id, shared_from_this()));
 }
 
-void SmartScopesClient::parse_line(std::string const& json, PreviewReplyHandler const& handler)
+std::string SmartScopesClient::handle_chunk(const std::string& chunk, std::function<void(const std::string&)> line_handler)
+{
+    // According to the docs, we expect:
+    // The response will have Content-Type
+    // application/json, it will be a chunked response, in practice a series of
+    // “\r\n” delimited lines, each containing one JSON object, with the
+    // possible forms, matching what currently can be pushed into a reply in the
+    // new scopes API
+    static constexpr const char separator{'\n'};
+
+    // read data line-by-line calling line_handler() for each
+    auto newline_pos = 0;
+    auto endline_pos = chunk.find(separator);
+    while (endline_pos != std::string::npos)
+    {
+        try
+        {
+            line_handler(chunk.substr(newline_pos, endline_pos - newline_pos));
+        }
+        catch (std::exception const &e)
+        {
+            BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.handle_chunk(): Failed to parse line: " << e.what();
+        }
+        newline_pos = endline_pos + 1;
+        endline_pos = chunk.find(separator, newline_pos);
+    }
+
+    // return the leftover data
+    return chunk.substr(newline_pos, chunk.size() - newline_pos);
+}
+
+void SmartScopesClient::handle_line(std::string const& json, PreviewReplyHandler const& handler)
 {
     JsonNodeInterface::SPtr root_node;
     JsonNodeInterface::SPtr child_node;
@@ -605,7 +634,7 @@
     }
 }
 
-void SmartScopesClient::parse_line(std::string const& json, SearchReplyHandler const& handler)
+void SmartScopesClient::handle_line(std::string const& json, SearchReplyHandler const& handler)
 {
     JsonNodeInterface::SPtr root_node;
     JsonNodeInterface::SPtr child_node;

=== modified file 'src/scopes/internal/zmq_middleware/ScopeI.cpp'
--- src/scopes/internal/zmq_middleware/ScopeI.cpp	2015-04-01 09:00:01 +0000
+++ src/scopes/internal/zmq_middleware/ScopeI.cpp	2015-06-09 10:03:04 +0000
@@ -76,6 +76,7 @@
                       { "preview", bind(&ScopeI::preview_, this, ph::_1, ph::_2, ph::_3) },
                       { "activate", bind(&ScopeI::activate_, this, ph::_1, ph::_2, ph::_3) },
                       { "perform_action", bind(&ScopeI::perform_action_, this, ph::_1, ph::_2, ph::_3) },
+                      { "activate_result_action", bind(&ScopeI::activate_result_action_, this, ph::_1, ph::_2, ph::_3) },
                       { "child_scopes", bind(&ScopeI::child_scopes_, this, ph::_1, ph::_2, ph::_3) },
                       { "set_child_scopes", bind(&ScopeI::set_child_scopes_, this, ph::_1, ph::_2, ph::_3) },
                       { "debug_mode", bind(&ScopeI::debug_mode_, this, ph::_1, ph::_2, ph::_3) }
@@ -201,6 +202,35 @@
     p.setCategory(ctrl_proxy->target_category().c_str());
 }
 
+void ScopeI::activate_result_action_(Current const& current,
+                           capnp::AnyPointer::Reader& in_params,
+                           capnproto::Response::Builder& r)
+{
+    auto req = in_params.getAs<capnproto::Scope::ResultActionActivationRequest>();
+    auto result = ResultImpl::create_result(to_variant_map(req.getResult()));
+    auto metadata = ActionMetadataImpl::create(to_variant_map(req.getHints()));
+    auto proxy = req.getReplyProxy();
+    auto action_id = req.getActionId().cStr();
+    ZmqReplyProxy reply_proxy(new ZmqReply(current.adapter->mw(),
+                                           proxy.getEndpoint().cStr(),
+                                           proxy.getIdentity().cStr(),
+                                           proxy.getCategory().cStr()));
+    auto delegate = dynamic_pointer_cast<ScopeObjectBase>(del());
+    assert(delegate);
+    auto ctrl_proxy = dynamic_pointer_cast<ZmqQueryCtrl>(delegate->activate_result_action(result,
+                                                                                          metadata,
+                                                                                          action_id,
+                                                                                          reply_proxy,
+                                                                                          to_info(current)));
+    assert(ctrl_proxy);
+    r.setStatus(capnproto::ResponseStatus::SUCCESS);
+    auto search_response = r.initPayload().getAs<capnproto::Scope::CreateQueryResponse>();
+    auto p = search_response.initReturnValue();
+    p.setEndpoint(ctrl_proxy->endpoint().c_str());
+    p.setIdentity(ctrl_proxy->identity().c_str());
+    p.setCategory(ctrl_proxy->target_category().c_str());
+}
+
 void ScopeI::child_scopes_(Current const&,
                            capnp::AnyPointer::Reader&,
                            capnproto::Response::Builder& r)

=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-08-04 06:31:27 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2015-06-09 10:03:04 +0000
@@ -42,6 +42,7 @@
     const string twoway_timeout_key = "Default.Twoway.Timeout";
     const string locate_timeout_key = "Locate.Timeout";
     const string registry_timeout_key = "Registry.Timeout";
+    const string child_scopes_timeout_key = "ChildScopes.Timeout";
     const string registry_endpoint_dir_key = "Registry.EndpointDir";
     const string ss_registry_endpoint_dir_key = "Smartscopes.Registry.EndpointDir";
 }
@@ -90,6 +91,12 @@
         throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
     }
 
+    child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
+    if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
+    {
+        throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");
+    }
+
     registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);
     ss_registry_endpoint_dir_ = get_optional_string(zmq_config_group, ss_registry_endpoint_dir_key);
 
@@ -100,6 +107,7 @@
                                                 twoway_timeout_key,
                                                 locate_timeout_key,
                                                 registry_timeout_key,
+                                                child_scopes_timeout_key,
                                                 registry_endpoint_dir_key,
                                                 ss_registry_endpoint_dir_key
                                              }
@@ -132,6 +140,11 @@
     return registry_timeout_;
 }
 
+int ZmqConfig::child_scopes_timeout() const
+{
+    return child_scopes_timeout_;
+}
+
 string ZmqConfig::registry_endpoint_dir() const
 {
     return registry_endpoint_dir_;

=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2015-01-23 05:00:02 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2015-06-09 10:03:04 +0000
@@ -107,6 +107,7 @@
         twoway_timeout_ = config.twoway_timeout();
         locate_timeout_ = config.locate_timeout();
         registry_timeout_ = config.registry_timeout();
+        child_scopes_timeout_ = config.child_scopes_timeout();
         public_endpoint_dir_ = config.endpoint_dir();
         private_endpoint_dir_ = public_endpoint_dir_ + "/priv";
         registry_endpoint_dir_ = public_endpoint_dir_;
@@ -814,6 +815,11 @@
     return registry_timeout_;
 }
 
+int64_t ZmqMiddleware::child_scopes_timeout() const noexcept
+{
+    return child_scopes_timeout_;
+}
+
 ObjectProxy ZmqMiddleware::make_typed_proxy(string const& endpoint,
                                             string const& identity,
                                             string const& category,

=== modified file 'src/scopes/internal/zmq_middleware/ZmqScope.cpp'
--- src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-04-01 09:28:20 +0000
+++ src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-06-09 10:03:04 +0000
@@ -178,6 +178,40 @@
     return make_shared<QueryCtrlImpl>(p, reply_proxy);
 }
 
+QueryCtrlProxy ZmqScope::activate_result_action(VariantMap const& result,
+        VariantMap const& hints,
+        std::string const& action_id,
+        MWReplyProxy const& reply)
+{
+    capnp::MallocMessageBuilder request_builder;
+    auto reply_proxy = dynamic_pointer_cast<ZmqReply>(reply);
+    {
+        auto request = make_request_(request_builder, "activate_result_action");
+        auto in_params = request.initInParams().getAs<capnproto::Scope::ResultActionActivationRequest>();
+        auto res = in_params.initResult();
+        to_value_dict(result, res);
+        auto h = in_params.initHints();
+        to_value_dict(hints, h);
+        in_params.setActionId(action_id);
+        auto p = in_params.initReplyProxy();
+        p.setEndpoint(reply_proxy->endpoint().c_str());
+        p.setIdentity(reply_proxy->identity().c_str());
+    }
+
+    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder); });
+
+    auto out_params = future.get();
+    auto response = out_params.reader->getRoot<capnproto::Response>();
+    throw_if_runtime_exception(response);
+
+    auto proxy = response.getPayload().getAs<capnproto::Scope::CreateQueryResponse>().getReturnValue();
+    ZmqQueryCtrlProxy p(new ZmqQueryCtrl(mw_base(),
+                                         proxy.getEndpoint().cStr(),
+                                         proxy.getIdentity().cStr(),
+                                         proxy.getCategory().cStr()));
+    return make_shared<QueryCtrlImpl>(p, reply_proxy);
+}
+
 QueryCtrlProxy ZmqScope::preview(VariantMap const& result, VariantMap const& hints, MWReplyProxy const& reply)
 {
     capnp::MallocMessageBuilder request_builder;
@@ -213,7 +247,8 @@
     capnp::MallocMessageBuilder request_builder;
     make_request_(request_builder, "child_scopes");
 
-    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder); });
+    int64_t timeout = mw_base()->child_scopes_timeout();
+    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder, timeout); });
 
     auto out_params = future.get();
     auto response = out_params.reader->getRoot<capnproto::Response>();
@@ -270,7 +305,8 @@
         }
     }
 
-    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder); });
+    int64_t timeout = mw_base()->child_scopes_timeout();
+    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder, timeout); });
     auto out_params = future.get();
     auto r = out_params.reader->getRoot<capnproto::Response>();
     throw_if_runtime_exception(r);
@@ -303,13 +339,18 @@
 
 ZmqObjectProxy::TwowayOutParams ZmqScope::invoke_scope_(capnp::MessageBuilder& in_params)
 {
+    return invoke_scope_(in_params, timeout());
+}
+
+ZmqObjectProxy::TwowayOutParams ZmqScope::invoke_scope_(capnp::MessageBuilder& in_params, int64_t timeout)
+{
     // Check if this scope has requested debug mode, if so, disable two-way timeout and set
     // locate timeout to 15s.
     if (debug_mode())
     {
         return this->invoke_twoway_(in_params, -1, 15000);
     }
-    return this->invoke_twoway_(in_params);
+    return this->invoke_twoway_(in_params, timeout);
 }
 
 } // namespace zmq_middleware

=== modified file 'src/scopes/internal/zmq_middleware/capnproto/Scope.capnp'
--- src/scopes/internal/zmq_middleware/capnproto/Scope.capnp	2015-04-01 09:00:01 +0000
+++ src/scopes/internal/zmq_middleware/capnproto/Scope.capnp	2015-06-09 10:03:04 +0000
@@ -59,6 +59,14 @@
     replyProxy @4 : Proxy.Proxy;
 }
 
+struct ResultActionActivationRequest
+{
+    result @0     : ValueDict.ValueDict;
+    hints @1      : ValueDict.ValueDict;
+    actionId @2   : Text;
+    replyProxy @3 : Proxy.Proxy;
+}
+
 struct PreviewRequest
 {
     result @0     : ValueDict.ValueDict;

=== modified file 'test/gtest/scopes/Activation/Activation_test.cpp'
--- test/gtest/scopes/Activation/Activation_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/Activation/Activation_test.cpp	2015-06-09 10:03:04 +0000
@@ -604,6 +604,50 @@
         EXPECT_EQ("widget1action1", response->scope_data().get_dict()["activated action"].get_string());
         EXPECT_EQ("maiden", response->scope_data().get_dict()["received_hints"].get_dict()["iron"].get_string());
         EXPECT_EQ("uri", response->scope_data().get_dict()["activated_uri"].get_string());
+   }
+}
+
+TEST(Activation, result_action)
+{
+    auto reg_rt = run_test_registry();
+
+    auto scope_rt = Runtime::create_scope_runtime("TestScope", TEST_DIR "/Runtime.ini");
+    RaiiScopeThread<TestScope> scope_thread(move(scope_rt));
+
+    // parent: connect to scope and run a query
+    auto rt = internal::RuntimeImpl::create("", TEST_DIR "/Runtime.ini");
+    auto mw = rt->factory()->create("TestScope", "Zmq", TEST_DIR "/Zmq.ini");
+    mw->start();
+    auto proxy = mw->create_scope_proxy("TestScope");
+    auto scope = internal::ScopeImpl::create(proxy, "TestScope");
+
+    VariantMap hints;
+    auto receiver = std::make_shared<SearchReceiver>();
+    auto ctrl = scope->search("test", SearchMetadata("pl", "phone"), receiver);
+    receiver->wait_until_finished();
+
+    auto result = receiver->result;
+    ASSERT_TRUE(result != nullptr);
+
+    auto target = result->target_scope_proxy();
+    EXPECT_TRUE(target != nullptr);
+
+    // activate result action
+    {
+        auto act_receiver = std::make_shared<ActivationReceiver>();
+        ActionMetadata meta("en", "phone");
+        hints["iron"] = "maiden";
+        meta.set_scope_data(Variant(hints));
+        ctrl = target->activate_result_action(*result, meta, "action1", act_receiver);
+        act_receiver->wait_until_finished();
+
+        auto response = act_receiver->response;
+        EXPECT_TRUE(response != nullptr);
+        EXPECT_EQ(ActivationResponse::Status::UpdateResult, response->status());
+        EXPECT_EQ("uri", response->updated_result().uri());
+        ASSERT_NO_THROW(response->updated_result().target_scope_proxy());
+        EXPECT_EQ("action1", response->scope_data().get_dict()["activated result action"].get_string());
+        EXPECT_EQ("maiden", response->scope_data().get_dict()["received_hints"].get_dict()["iron"].get_string());
     }
 }
 

=== modified file 'test/gtest/scopes/Activation/TestScope.h'
--- test/gtest/scopes/Activation/TestScope.h	2014-11-03 05:31:30 +0000
+++ test/gtest/scopes/Activation/TestScope.h	2015-06-09 10:03:04 +0000
@@ -94,6 +94,32 @@
     Variant recv_hints_;
 };
 
+class TestInCardActivation : public ActivationQueryBase
+{
+public:
+    TestInCardActivation(Result const& result, ActionMetadata const& metadata, std::string const& action_id,
+            std::string const& hint, std::string const& hint_val)
+        : ActivationQueryBase(result, metadata, action_id),
+          hint_key_(hint),
+          hint_val_(hint_val)
+    {
+    }
+
+    virtual ActivationResponse activate() override
+    {
+        ActivationResponse resp(result());
+        VariantMap var;
+        var[hint_key_] = hint_val_;
+        var["received_hints"] = action_metadata().scope_data(); // send received hints back for testing
+        resp.set_scope_data(Variant(var));
+        return resp;
+    }
+
+private:
+    std::string hint_key_;
+    std::string hint_val_;
+};
+
 class TestScope : public ScopeBase
 {
 public:
@@ -122,6 +148,11 @@
     {
         return ActivationQueryBase::UPtr(new TestActivation(result, hints, widget_id, action_id, "activated action", widget_id + action_id, result.uri(), hints.scope_data()));
     }
+
+    virtual ActivationQueryBase::UPtr activate_result_action(Result const& result, ActionMetadata const& hints, std::string const& action_id) override
+    {
+        return ActivationQueryBase::UPtr(new TestInCardActivation(result, hints, action_id, "activated result action", action_id));
+    }
 };
 
 } // namespace scopes

=== modified file 'test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp'
--- test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp	2014-02-27 16:58:50 +0000
+++ test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp	2015-06-09 10:03:04 +0000
@@ -19,6 +19,8 @@
 #include <unity/scopes/ActivationResponse.h>
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/internal/ActivationResponseImpl.h>
+#include <unity/scopes/internal/ResultImpl.h>
+#include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/UnityExceptions.h>
 #include <gtest/gtest.h>
 
@@ -53,6 +55,19 @@
         ActivationResponse resp(query);
         EXPECT_EQ(ActivationResponse::Status::PerformQuery, resp.status());
     }
+    {
+        VariantMap vm;
+        VariantMap attrs;
+        attrs["uri"] = "foo";
+        vm["internal"] = Variant(VariantMap());
+        vm["attrs"] = Variant(attrs);
+        auto const res = ResultImpl::create_result(vm);
+
+        ActivationResponse resp(res);
+        EXPECT_EQ(ActivationResponse::Status::UpdateResult, resp.status());
+        EXPECT_EQ(res.uri(), resp.updated_result().uri());
+    }
+
 
     // Search only allowed with CannedQuery
     {
@@ -63,6 +78,16 @@
         }
         catch (unity::InvalidArgumentException const&) {}
     }
+
+    // UpdateResult only allowed with Result
+    {
+        try
+        {
+            ActivationResponse resp(ActivationResponse::Status::UpdateResult);
+            FAIL();
+        }
+        catch (unity::InvalidArgumentException const&) {}
+    }
 }
 
 TEST(ActivationResponse, serialize)
@@ -85,16 +110,32 @@
         EXPECT_EQ(ActivationResponse::Status::PerformQuery, static_cast<ActivationResponse::Status>(var["status"].get_int()));
         EXPECT_EQ("scope-foo", var["query"].get_dict()["scope"].get_string());
     }
+    {
+        VariantMap vm;
+        VariantMap attrs;
+        attrs["uri"] = Variant("foo");
+        vm["internal"] = Variant(VariantMap());
+        vm["attrs"] = Variant(attrs);
+        auto const res = ResultImpl::create_result(vm);
+
+        ActivationResponse resp(res);
+        auto var = resp.serialize();
+        EXPECT_EQ(ActivationResponse::Status::UpdateResult, static_cast<ActivationResponse::Status>(var["status"].get_int()));
+        EXPECT_EQ("foo", var["updated_result"].get_dict()["attrs"].get_dict()["uri"].get_string());
+    }
 }
 
 TEST(ActivationResponse, deserialize)
 {
+    // just to make ResultImpl::set_runtime() happy, runtime must not be null.
+    auto runtime = internal::RuntimeImpl::create("fooscope", TEST_DIR "/Runtime.ini");
+
     // invalid variant
     {
         VariantMap var;
         try
         {
-            internal::ActivationResponseImpl res(var);
+            internal::ActivationResponseImpl res(var, runtime.get());
             FAIL();
         }
         catch (unity::LogicException const &e)
@@ -108,7 +149,7 @@
         var["scope_data"] = VariantMap();
         try
         {
-            internal::ActivationResponseImpl::create(var);
+            internal::ActivationResponseImpl::create(var, runtime.get());
             FAIL();
         }
         catch (unity::LogicException const &e)
@@ -125,7 +166,7 @@
         var["status"] = static_cast<int>(ActivationResponse::Status::PerformQuery);
         try
         {
-            internal::ActivationResponseImpl res(var);
+            internal::ActivationResponseImpl res(var, runtime.get());
             FAIL();
         }
         catch (unity::LogicException const &e) {}
@@ -140,7 +181,7 @@
         var["status"] = static_cast<int>(ActivationResponse::Status::HideDash);
         try
         {
-            internal::ActivationResponseImpl res(var);
+            internal::ActivationResponseImpl res(var, runtime.get());
             EXPECT_EQ("bar", res.scope_data().get_dict()["foo"].get_string());
             EXPECT_EQ(ActivationResponse::Status::HideDash, res.status());
         }
@@ -159,7 +200,7 @@
         var["query"] = query.serialize();
         try
         {
-            internal::ActivationResponseImpl res(var);
+            internal::ActivationResponseImpl res(var, runtime.get());
             EXPECT_EQ(ActivationResponse::Status::PerformQuery, res.status());
             EXPECT_EQ("scope-foo", res.query().scope_id());
         }
@@ -176,7 +217,7 @@
         var["status"] = static_cast<int>(ActivationResponse::Status::HideDash);
         try
         {
-            internal::ActivationResponseImpl res(var);
+            internal::ActivationResponseImpl res(var, runtime.get());
             EXPECT_EQ("foobar", res.scope_data().get_string());
             EXPECT_EQ(ActivationResponse::Status::HideDash, res.status());
         }

=== modified file 'test/gtest/scopes/ActivationResponse/CMakeLists.txt'
--- test/gtest/scopes/ActivationResponse/CMakeLists.txt	2014-01-15 11:29:22 +0000
+++ test/gtest/scopes/ActivationResponse/CMakeLists.txt	2015-06-09 10:03:04 +0000
@@ -1,4 +1,9 @@
 add_executable(ActivationResponse_test ActivationResponse_test.cpp)
+add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(ActivationResponse_test ${TESTLIBS})
 
+configure_file(Registry.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Registry.ini)
+configure_file(Runtime.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini)
+configure_file(Zmq.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Zmq.ini)
+
 add_test(ActivationResponse ActivationResponse_test)

=== added file 'test/gtest/scopes/ActivationResponse/Registry.ini.in'
--- test/gtest/scopes/ActivationResponse/Registry.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/ActivationResponse/Registry.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,6 @@
+[Registry]
+Middleware = Zmq
+Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
+Scope.InstallDir = /unused
+Click.InstallDir = /unused
+Scoperunner.Path = /unused

=== added file 'test/gtest/scopes/ActivationResponse/Runtime.ini.in'
--- test/gtest/scopes/ActivationResponse/Runtime.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/ActivationResponse/Runtime.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,6 @@
+[Runtime]
+Registry.Identity = TestRegistry
+Registry.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Registry.ini
+Default.Middleware = Zmq
+Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
+LogDir=

=== added file 'test/gtest/scopes/ActivationResponse/Zmq.ini.in'
--- test/gtest/scopes/ActivationResponse/Zmq.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/ActivationResponse/Zmq.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,2 @@
+[Zmq]
+EndpointDir = /tmp

=== modified file 'test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp'
--- test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2015-04-09 15:59:17 +0000
+++ test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2015-06-09 10:03:04 +0000
@@ -101,6 +101,10 @@
                     SearchMetadata const&,
                     SearchListenerBase::SPtr const&));
     MOCK_METHOD1(set_child_scopes, bool(ChildScopeList const&));
+    MOCK_METHOD4(activate_result_action, QueryCtrlProxy(unity::scopes::Result const&,
+                                                        ActionMetadata const&,
+                                                        std::string const&,
+                                                        ActivationListenerBase::SPtr const&));
 };
 
 

=== modified file 'test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt'
--- test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2014-12-03 06:53:40 +0000
+++ test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt	2015-06-09 10:03:04 +0000
@@ -11,6 +11,9 @@
 configure_file(bad_keywords.ini.in bad_keywords.ini copyonly)
 configure_file(empty_keywords.ini.in empty_keywords.ini copyonly)
 configure_file(single_keyword.ini.in single_keyword.ini copyonly)
+configure_file(empty_display_name.ini.in empty_display_name.ini copyonly)
+configure_file(empty_description.ini.in empty_description.ini copyonly)
+configure_file(empty_author.ini.in empty_author.ini copyonly)
 
 add_definitions(-DCOMPLETE_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/complete_config.ini")
 add_definitions(-DMANDATORY_CONFIG="${CMAKE_CURRENT_BINARY_DIR}/mandatory_config.ini")
@@ -25,6 +28,9 @@
 add_definitions(-DBAD_KEYWORDS="${CMAKE_CURRENT_BINARY_DIR}/bad_keywords.ini")
 add_definitions(-DEMPTY_KEYWORDS="${CMAKE_CURRENT_BINARY_DIR}/empty_keywords.ini")
 add_definitions(-DSINGLE_KEYWORD="${CMAKE_CURRENT_BINARY_DIR}/single_keyword.ini")
+add_definitions(-DEMPTY_DISPLAY_NAME="${CMAKE_CURRENT_BINARY_DIR}/empty_display_name.ini")
+add_definitions(-DEMPTY_DESCRIPTION="${CMAKE_CURRENT_BINARY_DIR}/empty_description.ini")
+add_definitions(-DEMPTY_AUTHOR="${CMAKE_CURRENT_BINARY_DIR}/empty_author.ini")
 
 add_executable(ScopeConfig_test ScopeConfig_test.cpp)
 target_link_libraries(ScopeConfig_test ${TESTLIBS})

=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2015-01-27 12:46:11 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2015-06-09 10:03:04 +0000
@@ -125,6 +125,7 @@
     try
     {
         ScopeConfig cfg(BAD_CHILD_IDS);
+        FAIL();
     }
     catch(ConfigException const& e)
     {
@@ -193,6 +194,7 @@
     try
     {
         ScopeConfig cfg(BAD_KEYWORDS);
+        FAIL();
     }
     catch(ConfigException const& e)
     {
@@ -213,6 +215,48 @@
     EXPECT_EQ(cfg.keywords().size(), 1);
 }
 
+TEST(ScopeConfig, empty_display_name)
+{
+    try
+    {
+        ScopeConfig cfg(EMPTY_DISPLAY_NAME);
+        FAIL();
+    }
+    catch(ConfigException const& e)
+    {
+        boost::regex r("unity::scopes::ConfigException: \".*\": DisplayName cannot be empty or whitespace only");
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
+    }
+}
+
+TEST(ScopeConfig, empty_description)
+{
+    try
+    {
+        ScopeConfig cfg(EMPTY_DESCRIPTION);
+        FAIL();
+    }
+    catch(ConfigException const& e)
+    {
+        boost::regex r("unity::scopes::ConfigException: \".*\": Description cannot be empty or whitespace only");
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
+    }
+}
+
+TEST(ScopeConfig, empty_author)
+{
+    try
+    {
+        ScopeConfig cfg(EMPTY_AUTHOR);
+        FAIL();
+    }
+    catch(ConfigException const& e)
+    {
+        boost::regex r("unity::scopes::ConfigException: \".*\": Author cannot be empty or whitespace only");
+        EXPECT_TRUE(boost::regex_match(e.what(), r));
+    }
+}
+
 class ScopeConfigWithIntl: public ::testing::Test
 {
 public:

=== added file 'test/gtest/scopes/internal/ScopeConfig/empty_author.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/empty_author.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/empty_author.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,4 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = Scope description
+Author =

=== added file 'test/gtest/scopes/internal/ScopeConfig/empty_description.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/empty_description.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/empty_description.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,4 @@
+[ScopeConfig]
+DisplayName = Scope name
+Description = \s
+Author = Canonical

=== added file 'test/gtest/scopes/internal/ScopeConfig/empty_display_name.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/empty_display_name.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/internal/ScopeConfig/empty_display_name.ini.in	2015-06-09 10:03:04 +0000
@@ -0,0 +1,4 @@
+[ScopeConfig]
+DisplayName =
+Description = Scope description
+Author = Canonical

=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2015-01-28 09:03:59 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2015-06-09 10:03:04 +0000
@@ -53,8 +53,7 @@
         , ss_config_("")
     {
         // set the LANGUAGE env var
-        std::string locale_env = "LANGUAGE=test_TEST";
-        ::putenv(const_cast<char*>(locale_env.c_str()));
+        ::setenv("LANGUAGE", "test_TEST", 1);
 
         // Instantiate runtime
         rt_ = RuntimeImpl::create(reg_id_, SS_RUNTIME_PATH);
@@ -191,38 +190,32 @@
 TEST_F(smartscopesproxytest, ss_registry_locale)
 {
     // set an invalid LANGUAGE env var (should return 0 scopes)
-    std::string locale_env = "LANGUAGE=test_FAIL";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", "test_FAIL", 1);
     reset_reg();
     EXPECT_EQ(0, reg_->list().size());
 
     // set an empty LANGUAGE env var (should return 2 scopes)
-    locale_env = "LANGUAGE=";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", "", 1);
     reset_reg();
     EXPECT_EQ(4u, reg_->list().size());
 
     // set a valid LANGUAGE env var (should return 2 scopes)
-    locale_env = "LANGUAGE=test_TEST";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", "test_TEST", 1);
     reset_reg();
     EXPECT_EQ(4u, reg_->list().size());
 
     // set a colon only LANGUAGE env var (should return 2 scopes)
-    locale_env = "LANGUAGE=:";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", ":", 1);
     reset_reg();
     EXPECT_EQ(4u, reg_->list().size());
 
     // set a colon seperated LANGUAGE env var (first valid - should return 2 scopes)
-    locale_env = "LANGUAGE=test_TEST:test_FAIL";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", "test_TEST:test_FAIL", 1);
     reset_reg();
     EXPECT_EQ(4u, reg_->list().size());
 
     // set a colon seperated LANGUAGE env var (first invalid - should return 0 scopes)
-    locale_env = "LANGUAGE=test_FAIL:test_TEST";
-    ::putenv(const_cast<char*>(locale_env.c_str()));
+    ::setenv("LANGUAGE", "test_FAIL:test_TEST", 1);
     reset_reg();
     EXPECT_EQ(0, reg_->list().size());
 }

=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-03-25 05:52:25 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-06-09 10:03:04 +0000
@@ -446,6 +446,15 @@
         return nullptr;
     }
 
+    virtual MWQueryCtrlProxy activate_result_action(Result const&,
+                                                    ActionMetadata const&,
+                                                    std::string const&,
+                                                    MWReplyProxy const&,
+                                                    InvokeInfo const&) override
+    {
+        return nullptr;
+    }
+
     virtual MWQueryCtrlProxy preview(Result const&,
                                      ActionMetadata const&,
                                      MWReplyProxy const&,