[network-manager-applet: 9/9] c-e, vpn: merge branch 'th/vpn-service-info-bgo767197'

[Thomas Haller <thaller src gnome org>]

commit e884f255dd8fd13d914a337de4281c243d037c29
Merge: 37cd5d6 9ab2f79
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jun 15 15:15:27 2016 +0200

    c-e,vpn: merge branch 'th/vpn-service-info-bgo767197'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767197

 shared/Makefile.am                         |    3 +-
 shared/nm-vpn-editor-plugin-call.h         |  189 ++++++++++++++++++++++++++++
 src/connection-editor/ce-new-connection.ui |   16 ++-
 src/connection-editor/ce-page.h            |    1 +
 src/connection-editor/connection-helpers.c |  182 ++++++++++++++++++++-------
 src/connection-editor/connection-helpers.h |    1 +
 src/connection-editor/nm-connection-list.c |    1 +
 src/connection-editor/page-bluetooth.c     |    1 +
 src/connection-editor/page-bluetooth.h     |    1 +
 src/connection-editor/page-bond.c          |    2 +
 src/connection-editor/page-bond.h          |    1 +
 src/connection-editor/page-bridge.c        |    1 +
 src/connection-editor/page-bridge.h        |    1 +
 src/connection-editor/page-dsl.c           |    1 +
 src/connection-editor/page-dsl.h           |    1 +
 src/connection-editor/page-ethernet.c      |    1 +
 src/connection-editor/page-ethernet.h      |    1 +
 src/connection-editor/page-infiniband.c    |    1 +
 src/connection-editor/page-infiniband.h    |    1 +
 src/connection-editor/page-mobile.c        |    3 +-
 src/connection-editor/page-mobile.h        |    1 +
 src/connection-editor/page-team.c          |    2 +
 src/connection-editor/page-team.h          |    1 +
 src/connection-editor/page-vlan.c          |    1 +
 src/connection-editor/page-vlan.h          |    1 +
 src/connection-editor/page-vpn.c           |   59 +++++++++-
 src/connection-editor/page-vpn.h           |    6 +
 src/connection-editor/page-wifi.c          |    1 +
 src/connection-editor/page-wifi.h          |    1 +
 src/connection-editor/vpn-helpers.c        |   17 ++-
 src/connection-editor/vpn-helpers.h        |    2 +-
 31 files changed, 440 insertions(+), 61 deletions(-)
---