[network-manager-libreswan: 21/21] all: merge branch 'th/vpn-editor-split-bgo766623'

[Thomas Haller <thaller src gnome org>]

commit 32202d1b195663e3b45b930296bb7b449810d531
Merge: 50666a7 39b4ba7
Author: Thomas Haller <thaller redhat com>
Date:   Mon May 23 09:09:26 2016 +0200

    all: merge branch 'th/vpn-editor-split-bgo766623'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=766623

 .gitignore                                         |    2 +
 Makefile.am                                        |   15 +-
 auth-dialog/Makefile.am                            |    1 +
 auth-dialog/main.c                                 |   11 +-
 common/Makefile.am                                 |   24 -
 configure.ac                                       |   93 +++-
 po/POTFILES.in                                     |    5 +-
 properties/Makefile.am                             |  118 +++--
 properties/libnm-libreswan-properties.ver          |    6 +
 properties/libnm-vpn-plugin-libreswan-editor.ver   |    6 +
 properties/libnm-vpn-plugin-libreswan.ver          |    6 +
 properties/nm-libreswan-editor-plugin.c            |  225 ++++++++
 ...nm-libreswan.h => nm-libreswan-editor-plugin.h} |   36 +-
 .../{nm-libreswan.c => nm-libreswan-editor.c}      |  205 +-------
 .../{nm-libreswan.h => nm-libreswan-editor.h}      |   33 +-
 shared/Makefile.am                                 |   65 +++
 shared/README                                      |   23 +
 shared/nm-default.h                                |  103 ++++
 .../nm-service-defines.h                           |    6 +-
 shared/nm-utils/gsystem-local-alloc.h              |  208 +++++++
 shared/nm-utils/nm-glib.h                          |  395 ++++++++++++++
 shared/nm-utils/nm-macros-internal.h               |  573 ++++++++++++++++++++
 shared/nm-utils/nm-shared-utils.c                  |  239 ++++++++
 shared/nm-utils/nm-shared-utils.h                  |   66 +++
 shared/nm-vpn/nm-vpn-plugin-utils.c                |  130 +++++
 shared/nm-vpn/nm-vpn-plugin-utils.h                |   40 ++
 {common => shared}/utils.c                         |    7 +-
 {common => shared}/utils.h                         |    5 +
 src/Makefile.am                                    |   71 ++-
 src/nm-libreswan-service-helper.c                  |   14 +-
 src/nm-libreswan-service.c                         |    9 +-
 src/show-xfrm.c                                    |    3 +-
 32 files changed, 2346 insertions(+), 397 deletions(-)
---