lp://staging/~phablet-team/telephony-service/join_existing_channels

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/telephony-service/staging at revision 1239

Gustavo Pichorim Boiko (community): Approve on 2017-03-20

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1243. By Tiago Salem Herrmann on 2017-01-05

merge parent branch

1242. By Tiago Salem Herrmann on 2016-12-16

merge trunk

1241. By Tiago Salem Herrmann on 2016-12-16

fix tests and protocol struct

1240. By Tiago Salem Herrmann on 2016-12-16

add property to join existing channels

1239. By Tiago Salem Herrmann on 2016-12-16

only notify messages ono rooms that contain self username

1238. By Tiago Salem Herrmann on 2016-12-16

merge parent branch

1237. By Tiago Salem Herrmann on 2016-12-15

sync with trunk

1236. By Gustavo Pichorim Boiko on 2016-11-25

Merge trunk.

1235. By Gustavo Pichorim Boiko on 2016-11-23

Address comments.

1234. By Gustavo Pichorim Boiko on 2016-11-23

Update copyright headers