[network-manager-applet: 12/12] c-e: merge branch 'th/c-e-import-fixes-bgo774290'

[Thomas Haller <thaller src gnome org>]

commit 0dc0af15ee9ee71f2a711101a139d50c9bd97e32
Merge: df2c136 f71a4dc
Author: Thomas Haller <thaller redhat com>
Date:   Thu Nov 24 11:30:11 2016 +0100

    c-e: merge branch 'th/c-e-import-fixes-bgo774290'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774290

 src/connection-editor/ce-page.h              |   28 ++++++++++-
 src/connection-editor/connection-helpers.c   |   31 ++++++------
 src/connection-editor/connection-helpers.h   |   19 ++++++-
 src/connection-editor/main.c                 |   61 +++++++++++++++---------
 src/connection-editor/nm-connection-editor.c |   64 ++++++++-----------------
 src/connection-editor/nm-connection-editor.h |    2 +-
 src/connection-editor/nm-connection-list.c   |   16 ++++--
 src/connection-editor/page-bluetooth.c       |   10 ++--
 src/connection-editor/page-bluetooth.h       |    3 +-
 src/connection-editor/page-bond.c            |   13 ++++--
 src/connection-editor/page-bond.h            |    3 +-
 src/connection-editor/page-bridge.c          |   11 +++-
 src/connection-editor/page-bridge.h          |    3 +-
 src/connection-editor/page-dsl.c             |    7 ++-
 src/connection-editor/page-dsl.h             |    3 +-
 src/connection-editor/page-ethernet.c        |    8 ++-
 src/connection-editor/page-ethernet.h        |    3 +-
 src/connection-editor/page-infiniband.c      |    8 ++-
 src/connection-editor/page-infiniband.h      |    3 +-
 src/connection-editor/page-master.c          |   10 ++--
 src/connection-editor/page-mobile.c          |   19 ++++----
 src/connection-editor/page-mobile.h          |    3 +-
 src/connection-editor/page-team.c            |   13 ++++--
 src/connection-editor/page-team.h            |    3 +-
 src/connection-editor/page-vlan.c            |   39 +++++++++-------
 src/connection-editor/page-vlan.h            |    3 +-
 src/connection-editor/page-vpn.c             |   17 +++++--
 src/connection-editor/page-vpn.h             |    3 +-
 src/connection-editor/page-wifi.c            |    7 ++-
 src/connection-editor/page-wifi.h            |    3 +-
 30 files changed, 253 insertions(+), 163 deletions(-)
---