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

[Thomas Haller <thaller src gnome org>]

commit 10133bc7292b292760819609e0fcf4e7c54af687
Merge: e147167 24021b5
Author: Thomas Haller <thaller redhat com>
Date:   Mon May 23 09:06:36 2016 +0200

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

 .gitignore                                         |    3 +
 Makefile.am                                        |   17 +-
 auth-dialog/Makefile.am                            |   31 +-
 auth-dialog/main.c                                 |   10 +-
 configure.ac                                       |   62 ++-
 m4/compiler_warnings.m4                            |   99 +++-
 po/POTFILES.in                                     |    5 +-
 properties/Makefile.am                             |  134 +++--
 properties/advanced-dialog.c                       |   28 +-
 properties/advanced-dialog.h                       |    3 -
 properties/import-export.c                         |   61 --
 properties/import-export.h                         |   32 --
 properties/libnm-pptp-properties.ver               |    6 +
 properties/libnm-vpn-plugin-pptp-editor.ver        |    6 +
 properties/libnm-vpn-plugin-pptp.ver               |    6 +
 properties/nm-pptp-editor-plugin.c                 |  239 ++++++++
 properties/{nm-pptp.h => nm-pptp-editor-plugin.h}  |   53 +--
 properties/{nm-pptp.c => nm-pptp-editor.c}         |  273 +---------
 properties/nm-pptp-editor.h                        |   47 ++
 shared/Makefile.am                                 |   63 +++
 shared/README                                      |   23 +
 shared/nm-default.h                                |  112 ++++
 .../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 ++
 src/Makefile.am                                    |   55 +-
 src/nm-pptp-pppd-plugin.c                          |   15 +-
 src/nm-pptp-service.c                              |   13 +-
 src/nm-pptp-service.h                              |    7 -
 34 files changed, 2496 insertions(+), 564 deletions(-)
---