[network-manager-applet: 4/4] merge: branch 'lr/import'

[Lubomir Rintel <lkundrak src gnome org>]

commit 2ee9f80e3f65370be801a6e0cfaa4f69202b8c69
Merge: 7c080df 735fa6e
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Nov 11 15:36:05 2016 +0100

    merge: branch 'lr/import'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773701

 src/connection-editor/ce-page.c            |   40 +++---
 src/connection-editor/ce-page.h            |   11 +-
 src/connection-editor/connection-helpers.c |  158 +++++++++++++++++++++++-
 src/connection-editor/connection-helpers.h |    3 +
 src/connection-editor/main.c               |   59 +++++++---
 src/connection-editor/nm-connection-list.c |    3 +-
 src/connection-editor/nm-connection-list.h |    2 +-
 src/connection-editor/page-bluetooth.c     |   27 +++--
 src/connection-editor/page-bluetooth.h     |    1 +
 src/connection-editor/page-bond.c          |   13 +-
 src/connection-editor/page-bond.h          |    1 +
 src/connection-editor/page-bridge.c        |   13 +-
 src/connection-editor/page-bridge.h        |    1 +
 src/connection-editor/page-dsl.c           |   14 +--
 src/connection-editor/page-dsl.h           |    1 +
 src/connection-editor/page-ethernet.c      |   14 +--
 src/connection-editor/page-ethernet.h      |    1 +
 src/connection-editor/page-infiniband.c    |   14 +--
 src/connection-editor/page-infiniband.h    |    1 +
 src/connection-editor/page-mobile.c        |   25 +++--
 src/connection-editor/page-mobile.h        |    1 +
 src/connection-editor/page-team.c          |   14 +-
 src/connection-editor/page-team.h          |    1 +
 src/connection-editor/page-vlan.c          |   14 +--
 src/connection-editor/page-vlan.h          |    1 +
 src/connection-editor/page-vpn.c           |  182 ++++++++++------------------
 src/connection-editor/page-vpn.h           |    8 +-
 src/connection-editor/page-wifi.c          |   14 +--
 src/connection-editor/page-wifi.h          |    1 +
 src/connection-editor/vpn-helpers.c        |   86 -------------
 src/connection-editor/vpn-helpers.h        |    3 -
 31 files changed, 386 insertions(+), 341 deletions(-)
---