[network-manager-applet: 7/7] proxy: merge branch 'th/proxy-bgo621767'

[Thomas Haller <thaller src gnome org>]

commit 56033f802d7bfdb91d3c0f60e5973979228f159e
Merge: 5018f91 90b9f92
Author: Thomas Haller <thaller redhat com>
Date:   Fri Dec 16 15:04:56 2016 +0100

    proxy: merge branch 'th/proxy-bgo621767'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=621767

 shared/Makefile.am                           |    1 +
 shared/nm-default.h                          |    2 +
 shared/nm-libnm-compat.h                     |   41 ++++
 src/connection-editor/Makefile.am            |    3 +
 src/connection-editor/ce-page-proxy.ui       |  174 ++++++++++++++
 src/connection-editor/connection-helpers.c   |   15 ++
 src/connection-editor/connection-helpers.h   |    1 +
 src/connection-editor/nm-connection-editor.c |    8 +
 src/connection-editor/nm-connection-list.c   |    6 +
 src/connection-editor/page-proxy.c           |  321 ++++++++++++++++++++++++++
 src/connection-editor/page-proxy.h           |   54 +++++
 11 files changed, 626 insertions(+), 0 deletions(-)
---