Merge lp://staging/~phablet-team/telephony-service/join_existing_channels into lp://staging/telephony-service/staging
Proposed by
Tiago Salem Herrmann
| Status: | Merged |
|---|---|
| Approved by: | Gustavo Pichorim Boiko |
| Approved revision: | 1243 |
| Merged at revision: | 1239 |
| Proposed branch: | lp://staging/~phablet-team/telephony-service/join_existing_channels |
| Merge into: | lp://staging/telephony-service/staging |
| Prerequisite: | lp://staging/~phablet-team/telephony-service/protocols-through-dbus |
| Diff against target: |
238 lines (+37/-8) 10 files modified
handler/Handler.xml (+2/-2) indicator/textchannelobserver.cpp (+6/-0) libtelephonyservice/dbustypes.h (+1/-0) libtelephonyservice/protocol.cpp (+11/-2) libtelephonyservice/protocol.h (+6/-0) libtelephonyservice/protocolmanager.cpp (+2/-2) protocols/README.protocols (+1/-0) protocols/ofono.protocol (+1/-0) tests/libtelephonyservice/ProtocolTest.cpp (+6/-2) tests/libtelephonyservice/testProtocols/foo.protocol (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/telephony-service/join_existing_channels |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gustavo Pichorim Boiko (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add new property to .protocol files to allow join existing channels.
Description of the change
Add new property to .protocol files to allow join existing channels.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good!