Merge lp://staging/~unity-api-team/indicator-network/port-to-qdbus-14.09 into lp://staging/indicator-network/14.09
Proposed by
Pete Woods
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Pete Woods | ||||||||||||
| Approved revision: | 475 | ||||||||||||
| Merged at revision: | 473 | ||||||||||||
| Proposed branch: | lp://staging/~unity-api-team/indicator-network/port-to-qdbus-14.09 | ||||||||||||
| Merge into: | lp://staging/indicator-network/14.09 | ||||||||||||
| Diff against target: |
24141 lines (+12119/-8529) 143 files modified
CMakeLists.txt (+8/-15) cmake/FindGObjectIntrospection.cmake (+0/-61) cmake/FindValgrind.cmake (+13/-13) cmake/UseGObjectIntrospection.cmake (+0/-100) data/com.ubuntu.connectivity1.NetworkingStatus.xml (+11/-0) data/com.ubuntu.connectivity1.Private.xml (+15/-0) data/nm-access-point.xml (+93/-0) data/nm-active-connection.xml (+145/-0) data/nm-device-wifi.xml (+132/-0) data/nm-device.xml (+598/-0) data/nm-manager.xml (+412/-0) data/nm-settings-connection.xml (+157/-0) data/org.freedesktop.URfkill.Device.xml (+143/-0) data/org.freedesktop.URfkill.Killswitch.xml (+78/-0) data/org.freedesktop.URfkill.xml (+388/-0) debian/control (+6/-8) sniffer/CMakeLists.txt (+36/-0) sniffer/eventprinter.h (+70/-0) sniffer/i-n-extractor.cpp (+152/-0) src/CMakeLists.txt (+3/-2) src/connectivity-cpp/CMakeLists.txt (+6/-16) src/connectivity-cpp/dbus-cpp/services/nm.h (+0/-979) src/connectivity-cpp/dbus-cpp/services/ofono.h (+0/-339) src/connectivity-cpp/dbus-cpp/services/urfkill.h (+0/-338) src/connectivity-cpp/dbus-cpp/services/util.h (+0/-36) src/connectivity-cpp/include/connectivity/networking/service.h (+0/-83) src/connectivity-cpp/include/connectivity/networking/service/tethering/service.h (+0/-59) src/connectivity-cpp/include/connectivity/networking/service/tor/service.h (+0/-46) src/connectivity-cpp/include/connectivity/networking/service/vpn/service.h (+0/-49) src/connectivity-cpp/src/CMakeLists.txt (+24/-5) src/connectivity-cpp/src/platform/nmofono/CMakeLists.txt (+0/-42) src/connectivity-cpp/src/platform/nmofono/bounded_integer.h (+0/-178) src/connectivity-cpp/src/platform/nmofono/manager_ref.h (+0/-483) src/connectivity-cpp/src/platform/nmofono/ofono_nm_connectivity_manager.cpp (+0/-338) src/connectivity-cpp/src/platform/nmofono/service.cpp (+0/-18) src/connectivity-cpp/src/platform/nmofono/service.h (+0/-47) src/connectivity-cpp/src/platform/nmofono/set_name_for_thread.cpp (+0/-24) src/connectivity-cpp/src/platform/nmofono/set_name_for_thread.h (+0/-28) src/connectivity-cpp/src/platform/util.cpp (+0/-33) src/dbus-cpp/CMakeLists.txt (+0/-1) src/dbus-cpp/services/ofono.h (+0/-1574) src/indicator/CMakeLists.txt (+97/-28) src/indicator/connectivity-service/connectivity-service.cpp (+155/-337) src/indicator/connectivity-service/connectivity-service.h (+55/-19) src/indicator/factory.cpp (+129/-0) src/indicator/factory.h (+67/-0) src/indicator/indicator-menu.cpp (+99/-0) src/indicator/indicator-menu.h (+14/-63) src/indicator/main.cpp (+27/-69) src/indicator/menu-builder.cpp (+143/-0) src/indicator/menu-builder.h (+19/-154) src/indicator/menuitems/access-point-item.cpp (+15/-44) src/indicator/menuitems/access-point-item.h (+6/-2) src/indicator/menuitems/item.h (+2/-1) src/indicator/menuitems/modem-info-item.cpp (+23/-33) src/indicator/menuitems/modem-info-item.h (+11/-9) src/indicator/menuitems/switch-item.cpp (+75/-0) src/indicator/menuitems/switch-item.h (+22/-50) src/indicator/menuitems/text-item.cpp (+42/-0) src/indicator/menuitems/text-item.h (+7/-27) src/indicator/menuitems/wifi-link-item.cpp (+14/-30) src/indicator/menuitems/wifi-link-item.h (+1/-1) src/indicator/menuitems/wwan-link-item.cpp (+38/-42) src/indicator/modem-manager.cpp (+97/-175) src/indicator/modem-manager.h (+15/-9) src/indicator/modem.cpp (+527/-282) src/indicator/modem.h (+110/-74) src/indicator/nmofono/kill-switch-impl.cpp (+90/-46) src/indicator/nmofono/kill-switch-impl.h (+23/-13) src/indicator/nmofono/link.h (+15/-5) src/indicator/nmofono/manager-impl.cpp (+186/-193) src/indicator/nmofono/manager-impl.h (+19/-20) src/indicator/nmofono/manager.cpp (+1/-18) src/indicator/nmofono/manager.h (+37/-36) src/indicator/nmofono/wifi/access-point-impl.cpp (+50/-32) src/indicator/nmofono/wifi/access-point-impl.h (+24/-22) src/indicator/nmofono/wifi/access-point.cpp (+36/-0) src/indicator/nmofono/wifi/access-point.h (+16/-6) src/indicator/nmofono/wifi/grouped-access-point-impl.cpp (+67/-81) src/indicator/nmofono/wifi/grouped-access-point-impl.h (+14/-16) src/indicator/nmofono/wifi/wifi-link-impl.cpp (+346/-325) src/indicator/nmofono/wifi/wifi-link-impl.h (+25/-31) src/indicator/nmofono/wifi/wifi-link.h (+14/-6) src/indicator/root-state.cpp (+93/-90) src/indicator/root-state.h (+10/-4) src/indicator/sections/quick-access-section.cpp (+58/-55) src/indicator/sections/quick-access-section.h (+4/-3) src/indicator/sections/wifi-section.cpp (+51/-54) src/indicator/sections/wifi-section.h (+4/-2) src/indicator/sections/wwan-section.cpp (+24/-23) src/indicator/sections/wwan-section.h (+1/-1) src/indicator/sim-unlock-dialog.cpp (+163/-144) src/indicator/sim-unlock-dialog.h (+16/-5) src/indicator/util/unix-signal-handler.cpp (+101/-0) src/indicator/util/unix-signal-handler.h (+59/-0) src/menumodel-cpp/CMakeLists.txt (+6/-0) src/menumodel-cpp/action-group-exporter.cpp (+128/-0) src/menumodel-cpp/action-group-exporter.h (+17/-51) src/menumodel-cpp/action-group-merger.cpp (+108/-0) src/menumodel-cpp/action-group-merger.h (+18/-101) src/menumodel-cpp/action-group.cpp (+59/-0) src/menumodel-cpp/action-group.h (+22/-59) src/menumodel-cpp/action.cpp (+31/-39) src/menumodel-cpp/action.h (+15/-13) src/menumodel-cpp/gio-helpers/util.cpp (+19/-37) src/menumodel-cpp/gio-helpers/util.h (+4/-50) src/menumodel-cpp/gio-helpers/variant.h (+21/-2) src/menumodel-cpp/menu-exporter.h (+1/-0) src/menumodel-cpp/menu-item.cpp (+119/-0) src/menumodel-cpp/menu-item.h (+25/-107) src/menumodel-cpp/menu-merger.h (+9/-12) src/menumodel-cpp/menu-model.h (+4/-1) src/menumodel-cpp/menu.cpp (+170/-0) src/menumodel-cpp/menu.h (+24/-160) src/notify-cpp/notification.cpp (+92/-58) src/notify-cpp/notification.h (+39/-17) src/notify-cpp/snapdecision/sim-unlock.cpp (+122/-85) src/notify-cpp/snapdecision/sim-unlock.h (+45/-23) src/qdbus-stubs/CMakeLists.txt (+115/-0) src/qdbus-stubs/DBusTypes.h (+51/-0) src/qdbus-stubs/backend-utils.h (+42/-0) src/secret-agent/CMakeLists.txt (+0/-1) tests/CMakeLists.txt (+1/-0) tests/autopilot/indicator_network/data/pin-unlock.xml (+3/-3) tests/data/phonesim/pin-unlock.xml (+3/-3) tests/integration/CMakeLists.txt (+2/-35) tests/integration/indicator/CMakeLists.txt (+34/-0) tests/integration/indicator/TestIndicatorNetworkService.cpp (+3258/-23) tests/menuharness/CMakeLists.txt (+15/-0) tests/menuharness/MatchResult.cpp (+179/-0) tests/menuharness/MatchResult.h (+61/-0) tests/menuharness/MatchUtils.cpp (+72/-0) tests/menuharness/MatchUtils.h (+35/-0) tests/menuharness/MenuItemMatcher.cpp (+837/-0) tests/menuharness/MenuItemMatcher.h (+122/-0) tests/menuharness/MenuMatcher.cpp (+201/-0) tests/menuharness/MenuMatcher.h (+90/-0) tests/unit/CMakeLists.txt (+5/-1) tests/unit/indicator/menuitems/CMakeLists.txt (+1/-4) tests/unit/indicator/menuitems/test-access-point-item.cpp (+6/-11) tests/unit/menumodel-cpp/test-menu-exporter.cpp (+11/-23) tests/unit/secret-agent/CMakeLists.txt (+0/-1) tests/utils/main.cpp (+30/-14) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~unity-api-team/indicator-network/port-to-qdbus-14.09 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Port all dbus interactions to QDBus
Description of the change
Port all dbus interactions to QDBus
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
