core: merge branch 'lr/applied-connection-bgo724041'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 18 September 2015 10:39 UTC

24dc789 core: merge branch 'lr/applied-connection-bgo724041'

libnm-core/nm-connection.c | 6 +-
libnm-core/nm-core-internal.h | 14 +-
libnm-core/nm-setting-connection.c | 8 +
libnm-core/nm-setting-private.h | 10 +
libnm-core/nm-setting.c | 19 +-
libnm-core/nm-setting.h | 2 +-
src/devices/adsl/nm-device-adsl.c | 4 +-
src/devices/bluetooth/nm-device-bt.c | 2 +-
src/devices/nm-device-bond.c | 4 +-
src/devices/nm-device-bridge.c | 2 +-
src/devices/nm-device-ethernet.c | 43 +--
src/devices/nm-device-infiniband.c | 4 +-
src/devices/nm-device-vlan.c | 6 +-
src/devices/nm-device.c | 249 +++++++++----
src/devices/nm-device.h | 13 +-
src/devices/team/nm-device-team.c | 6 +-
src/devices/wifi/nm-device-olpc-mesh.c | 2 +-
src/devices/wifi/nm-device-wifi.c | 81 ++--
src/devices/wwan/nm-device-modem.c | 2 +-
src/devices/wwan/nm-modem.c | 11 +-
src/nm-activation-request.c | 152 +++++---
src/nm-activation-request.h | 19 +-
src/nm-active-connection.c | 177 +++++++--
src/nm-active-connection.h | 19 +-
src/nm-audit-manager.c | 8 +-
src/nm-audit-manager.h | 2 +-
src/nm-default-route-manager.c | 6 +-
src/nm-dispatcher.c | 63 ++--
src/nm-dispatcher.h | 12 +-
src/nm-manager.c | 335 +++++++++--------
src/nm-manager.h | 4 +-
src/nm-policy.c | 134 +++----
src/ppp-manager/nm-ppp-manager.c | 35 +-
src/settings/nm-agent-manager.c | 42 ++-
src/settings/nm-agent-manager.h | 11 +-
src/settings/nm-secret-agent.c | 36 +-
src/settings/nm-secret-agent.h | 3 +
src/settings/nm-settings-connection.c | 608 ++++++++++++++++++++----------
src/settings/nm-settings-connection.h | 11 +-
src/settings/nm-settings.c | 25 +-
src/settings/nm-settings.h | 2 +-
src/vpn-manager/nm-vpn-connection.c | 639 +++++++++++++++++---------------
src/vpn-manager/nm-vpn-connection.h | 36 +-
src/vpn-manager/nm-vpn-manager.c | 7 +-
44 files changed, 1740 insertions(+), 1134 deletions(-)

Upstream: cgit.freedesktop.org

  • Share