Merge lp://staging/~phablet-team/telephony-service/refactor_fallback into lp://staging/telephony-service/staging
Proposed by
Tiago Salem Herrmann
Status: | Merged |
---|---|
Approved by: | Tiago Salem Herrmann |
Approved revision: | 1235 |
Merged at revision: | 1225 |
Proposed branch: | lp://staging/~phablet-team/telephony-service/refactor_fallback |
Merge into: | lp://staging/telephony-service/staging |
Prerequisite: | lp://staging/~phablet-team/telephony-service/roles-client-interface |
Diff against target: |
1433 lines (+573/-321) 24 files modified
Ubuntu/Telephony/components.cpp (+3/-1) handler/messagesendingjob.cpp (+8/-20) indicator/messagingmenu.cpp (+2/-2) indicator/textchannelobserver.cpp (+5/-5) libtelephonyservice/CMakeLists.txt (+1/-1) libtelephonyservice/accountentry.cpp (+20/-2) libtelephonyservice/accountentry.h (+4/-2) libtelephonyservice/accountentryfactory.cpp (+1/-5) libtelephonyservice/accountlist.cpp (+145/-0) libtelephonyservice/accountlist.h (+71/-0) libtelephonyservice/chatentry.cpp (+2/-2) libtelephonyservice/chatmanager.cpp (+10/-11) libtelephonyservice/multimediaaccountentry.cpp (+0/-58) libtelephonyservice/multimediaaccountentry.h (+0/-48) libtelephonyservice/protocol.cpp (+54/-3) libtelephonyservice/protocol.h (+44/-2) libtelephonyservice/telepathyhelper.cpp (+106/-54) libtelephonyservice/telepathyhelper.h (+37/-23) protocols/README.protocols (+22/-0) protocols/ofono.protocol (+1/-0) tests/libtelephonyservice/CMakeLists.txt (+0/-1) tests/libtelephonyservice/MultimediaAccountEntryTest.cpp (+0/-78) tests/libtelephonyservice/ProtocolTest.cpp (+32/-3) tests/libtelephonyservice/testProtocols/foo.protocol (+5/-0) |
To merge this branch: | bzr merge lp://staging/~phablet-team/telephony-service/refactor_fallback |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tiago Salem Herrmann (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Pending | |
Review via email:
|
This proposal supersedes a proposal from 2016-10-03.
Commit message
Handle the account fallback cases using the protocol information.
Description of the change
Handle the account fallback cases using the protocol information.
To post a comment you must log in.
FAILED: Continuous integration, rev:1224 /jenkins. canonical. com/system- apps/job/ lp-telephony- service- ci/69/ /jenkins. canonical. com/system- apps/job/ build/1723/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1723 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1568/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1568/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-telephony- service- ci/69/rebuild
https:/