lp:~phablet-team/messaging-framework/multiple_api_fixes
Created by
Tiago Salem Herrmann
and last modified
- Get this branch:
- bzr branch lp:~phablet-team/messaging-framework/multiple_api_fixes
Members of
Ubuntu Phablet Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
1 branch
dependent on this one.
Approved
for merging
into
lp:messaging-framework
- Gustavo Pichorim Boiko (community): Approve
- Roberto Mier Escandon (community): Approve
- system-apps-ci-bot: Approve (continuous-integration)
-
Diff: 424 lines (+100/-11)20 files modifieddebian/control.in (+0/-1)
include/messaging/connection.h (+4/-0)
include/messaging/connector.h (+2/-0)
include/messaging/group_manager.h (+3/-0)
include/messaging/plugin_connector.h (+2/-0)
include/messaging/qt/network_monitor.h (+1/-1)
include/messaging/qt/tp/connection.h (+5/-0)
src/messaging/connection.cpp (+5/-0)
src/messaging/plugin_connector.cpp (+5/-0)
src/messaging/qt/network_monitor.cpp (+4/-2)
src/messaging/qt/tp/connection.cpp (+42/-3)
src/messaging/qt/tp/protocol.cpp (+4/-1)
src/messaging/qt/tp/text_channel.cpp (+8/-3)
tests/mock_connection.h (+1/-0)
tests/mock_connector.h (+1/-0)
tests/mock_group_manager.h (+1/-0)
tests/unit/messaging/blocking_connector.cpp (+5/-0)
tests/unit/messaging/blocking_connector.h (+1/-0)
tests/unit/messaging/plugin_connector_test.cpp (+5/-0)
tests/unit/messaging/runner_test.cpp (+1/-0)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:messaging-framework