lp:~ken-vandine/content-hub/peer_details
Created by
Ken VanDine
and last modified
- Get this branch:
- bzr branch lp:~ken-vandine/content-hub/peer_details
Only
Ken VanDine
can upload to this branch. If you are
Ken VanDine
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Michael Sheldon (community): Approve
- PS Jenkins bot: Approve (continuous-integration)
- Ubuntu Phablet Team: Pending requested
-
Diff: 3503 lines (+1675/-450)59 files modifiedCMakeLists.txt (+3/-0)
examples/export-qml/app-exporter.qml (+207/-0)
examples/exporter/CMakeLists.txt (+1/-1)
examples/exporter/exampleexporter.cpp (+7/-1)
examples/exporter/exampleexporter.h (+1/-1)
examples/exporter/exporter.cpp (+18/-0)
examples/importer/CMakeLists.txt (+1/-1)
examples/importer/example.cpp (+3/-4)
examples/importer/exampleimporter.cpp (+12/-5)
examples/importer/exampleimporter.h (+1/-0)
examples/importer/importer.cpp (+18/-1)
import/Ubuntu/Content/CMakeLists.txt (+15/-3)
import/Ubuntu/Content/contenthub.cpp (+175/-18)
import/Ubuntu/Content/contenthub.h (+17/-2)
import/Ubuntu/Content/contentpeer.cpp (+26/-2)
import/Ubuntu/Content/contentpeer.h (+6/-2)
import/Ubuntu/Content/contenttransfer.cpp (+36/-20)
import/Ubuntu/Content/contenttransfer.h (+4/-3)
import/Ubuntu/Content/qmlimportexporthandler.cpp (+8/-0)
import/Ubuntu/Content/qmlimportexporthandler.h (+2/-0)
include/com/ubuntu/content/hub.h (+8/-3)
include/com/ubuntu/content/import_export_handler.h (+1/-0)
include/com/ubuntu/content/peer.h (+22/-4)
include/com/ubuntu/content/transfer.h (+10/-0)
include/com/ubuntu/content/type.h (+2/-0)
libcontent-hub.pc.in (+3/-0)
src/com/ubuntu/content/CMakeLists.txt (+2/-1)
src/com/ubuntu/content/detail/app_manager.cpp (+5/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Handler.xml (+3/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml (+27/-12)
src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml (+3/-0)
src/com/ubuntu/content/detail/handler.cpp (+18/-3)
src/com/ubuntu/content/detail/handler.h (+1/-0)
src/com/ubuntu/content/detail/peer_registry.h (+8/-5)
src/com/ubuntu/content/detail/service.cpp (+356/-138)
src/com/ubuntu/content/detail/service.h (+15/-8)
src/com/ubuntu/content/detail/transfer.cpp (+12/-2)
src/com/ubuntu/content/detail/transfer.h (+3/-1)
src/com/ubuntu/content/hub.cpp (+101/-27)
src/com/ubuntu/content/peer.cpp (+102/-7)
src/com/ubuntu/content/service/CMakeLists.txt (+2/-3)
src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml (+29/-1)
src/com/ubuntu/content/service/helper.cpp (+1/-1)
src/com/ubuntu/content/service/hook.cpp (+42/-30)
src/com/ubuntu/content/service/hook.h (+12/-0)
src/com/ubuntu/content/service/main.cpp (+1/-1)
src/com/ubuntu/content/service/registry.cpp (+169/-59)
src/com/ubuntu/content/service/registry.h (+12/-6)
src/com/ubuntu/content/transfer.cpp (+5/-0)
src/com/ubuntu/content/transfer_p.h (+12/-0)
src/com/ubuntu/content/utils.cpp (+13/-0)
tests/acceptance-tests/CMakeLists.txt (+14/-14)
tests/acceptance-tests/app_hub_communication_default_source.cpp (+13/-9)
tests/acceptance-tests/app_hub_communication_handler.cpp (+13/-10)
tests/acceptance-tests/app_hub_communication_known_sources.cpp (+15/-11)
tests/acceptance-tests/app_hub_communication_stores.cpp (+11/-7)
tests/acceptance-tests/app_hub_communication_transfer.cpp (+34/-12)
tests/acceptance-tests/app_manager_mock.h (+1/-1)
tests/acceptance-tests/test_hook.cpp (+13/-10)
Related source package recipes
Branch information
Recent revisions
- 107. By Ken VanDine
-
Added iconName to Peer to handle themed icons, the qml bindings will load the
icon from the iconName if icon is NULL.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:content-hub
