~unity-api-team/unity-scopes-api/child-scopes-option

« back to all changes in this revision

Viewing changes to STRUCTS

Committer: Marcus Tomlinson
Date: 2014-10-08 10:58:57 UTC
mfrom: (497.1.3 devel)
mto: (497.1.5 devel)
mto: This revision was merged to the branch mainline in revision 505.
Revision ID: marcus.tomlinson@canonical.com-20141008105857-gf4ilb9ywfeaeroi

Merged devel

files added:
tools/symbol_diff.in

files modified:
HACKING

STRUCTS

debian/changelog

debian/control

debian/libunity-scopes3.symbols

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

include/unity/scopes/internal/zmq_middleware/ConnectionPool.h

include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h

include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h

include/unity/scopes/internal/zmq_middleware/ZmqScope.h

include/unity/scopes/internal/zmq_middleware/ZmqSender.h

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/headers/compile_headers.py

tools/CMakeLists.txt

valgrind-suppress

Show diffs side-by-side

added added

removed removed

STRUCTS

154

============================================

155

'status' : int (corresponds to ActivationResponse::Status enum)

156

'scope_data' : variant

157

158

QueryMetadata (returned by serialize())

159

=======================================

160

'type' : string (metadata type)

161

'locale' : string

162

'form_factor' : string

163

'hints' : dict

164

'internet_connectivity' : bool (optional)

165

166

SearchMetadata (returned by serialize())

167

========================================

168

all QueryMetadata attributes

169

'cardinality' : int

170

'location' : dict

171

172

ActionMetadata (returned by serialize())

173

========================================

174

all QueryMetadata attributes

175

'scope_data' : variant

Older »