Merge lp://staging/~unity-api-team/indicator-network/mobile_data_switch into lp://staging/indicator-network
Proposed by
Antti Kaijanmäki
| Status: | Rejected |
|---|---|
| Rejected by: | Antti Kaijanmäki |
| Proposed branch: | lp://staging/~unity-api-team/indicator-network/mobile_data_switch |
| Merge into: | lp://staging/indicator-network |
| Diff against target: |
8959 lines (+7904/-17) 62 files modified
CMakeLists.txt (+2/-0) data/com.ubuntu.connectivity1.Modem.xml (+9/-0) data/com.ubuntu.connectivity1.Private.xml (+8/-0) data/com.ubuntu.connectivity1.Sim.xml (+16/-0) scripts/CMakeLists.txt (+5/-0) scripts/disable-mobile-data.sh (+8/-0) scripts/enable-mobile-data.sh (+8/-0) scripts/get-mobile-data-enabled.sh (+6/-0) scripts/get-modems.sh (+6/-0) scripts/get-sim-for-mobile-data.sh (+6/-0) scripts/get-sims.sh (+6/-0) scripts/monitor-private-properties.sh (+7/-0) scripts/set-sim-for-mobile-data.sh (+8/-0) src/connectivity-api/connectivity-qml/CMakeLists.txt (+1/-1) src/connectivity-api/connectivity-qml/plugin.cpp (+14/-1) src/connectivity-api/connectivity-qml/proxy-model.h (+80/-0) src/connectivity-api/connectivity-qt/CMakeLists.txt (+21/-2) src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp (+92/-0) src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h (+24/-0) src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp (+112/-0) src/connectivity-api/connectivity-qt/connectivityqt/modem.h (+68/-0) src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp (+172/-0) src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h (+78/-0) src/connectivity-api/connectivity-qt/connectivityqt/path.cpp (+103/-0) src/connectivity-api/connectivity-qt/connectivityqt/path.h (+59/-0) src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp (+153/-0) src/connectivity-api/connectivity-qt/connectivityqt/sim.h (+90/-0) src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp (+214/-0) src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h (+93/-0) src/indicator/CMakeLists.txt (+21/-0) src/indicator/connectivity-service/connectivity-service.cpp (+185/-0) src/indicator/connectivity-service/connectivity-service.h (+17/-0) src/indicator/connectivity-service/dbus-modem.cpp (+98/-0) src/indicator/connectivity-service/dbus-modem.h (+83/-0) src/indicator/connectivity-service/dbus-sim.cpp (+149/-0) src/indicator/connectivity-service/dbus-sim.h (+103/-0) src/indicator/factory.cpp (+12/-2) src/indicator/factory.h (+3/-1) src/indicator/menu-builder.cpp (+3/-1) src/indicator/nmofono/manager-impl.cpp (+210/-0) src/indicator/nmofono/manager-impl.h (+12/-0) src/indicator/nmofono/manager.h (+26/-0) src/indicator/nmofono/wwan/modem.cpp (+63/-2) src/indicator/nmofono/wwan/modem.h (+10/-0) src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp (+251/-0) src/indicator/nmofono/wwan/qofono-sim-wrapper.h (+77/-0) src/indicator/nmofono/wwan/sim-manager.cpp (+271/-0) src/indicator/nmofono/wwan/sim-manager.h (+56/-0) src/indicator/nmofono/wwan/sim.cpp (+582/-0) src/indicator/nmofono/wwan/sim.h (+182/-0) src/indicator/sections/wwan-section.cpp (+9/-5) src/indicator/sections/wwan-section.h (+1/-1) src/qdbus-stubs/dbus-types.h (+13/-0) tests/data/phonesim/sim_general.xml (+3677/-0) tests/integration/CMakeLists.txt (+2/-0) tests/integration/indicator-network-test-base.cpp (+8/-0) tests/integration/indicator-network-test-base.h (+1/-0) tests/integration/qml/test.qml (+119/-0) tests/integration/test-connectivity-api-modem.cpp (+53/-0) tests/integration/test-connectivity-api-sim.cpp (+68/-0) tests/integration/test-connectivity-api.cpp (+21/-0) tests/integration/test-indicator.cpp (+49/-1) |
| To merge this branch: | bzr merge lp://staging/~unity-api-team/indicator-network/mobile_data_switch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
New Connectivity Service Private API for managing mobile data and SIM cards.
To post a comment you must log in.
Unmerged revisions
- 595. By Antti Kaijanmäki
-
cleanups
- 594. By Antti Kaijanmäki
-
add simple qml program
- 593. By Antti Kaijanmäki
-
finish qml bindings.
- 592. By Antti Kaijanmäki
-
merge upstream
- 591. By Antti Kaijanmäki
-
QML API start
- 590. By Antti Kaijanmäki
-
add phonesim/
general_ sim.xml - 589. By Antti Kaijanmäki
-
Get the ConnectionManager interface for actually managing the data connection.
- 588. By Antti Kaijanmäki
-
added scripts/
- 587. By Antti Kaijanmäki
-
commit for a while..
- 586. By Antti Kaijanmäki
-
Augment nmofono::Manager interface.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
