[network-manager-openvpn: 16/16] properties: merge branch 'th/vpn-editor-split-bgo765732'

[Thomas Haller <thaller src gnome org>]

commit 49d0b0e30e892d7cd64df17eefd16c438bbd09a3
Merge: b22736e 79bd0ae
Author: Thomas Haller <thaller redhat com>
Date:   Fri May 6 15:07:55 2016 +0200

    properties: merge branch 'th/vpn-editor-split-bgo765732'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765732

 Makefile.am                                        |    8 +-
 auth-dialog/main.c                                 |    6 +-
 configure.ac                                       |   46 +++-
 po/POTFILES.in                                     |    4 +-
 properties/Makefile.am                             |   83 +++++--
 properties/auth-helpers.c                          |    9 +-
 properties/auth-helpers.h                          |    8 -
 properties/import-export.c                         |   10 +-
 properties/import-export.h                         |    8 -
 properties/libnm-vpn-plugin-openvpn-editor.ver     |    6 +
 properties/nm-openvpn-editor-plugin.c              |  234 ++++++++++++++++++++
 .../{nm-openvpn.h => nm-openvpn-editor-plugin.h}   |   36 +--
 properties/{nm-openvpn.c => nm-openvpn-editor.c}   |  195 +++--------------
 properties/{nm-openvpn.h => nm-openvpn-editor.h}   |   33 +---
 properties/tests/test-import-export.c              |    8 +-
 shared/Makefile.am                                 |   51 ++++-
 shared/nm-default.h                                |   14 +-
 shared/nm-vpn-plugin-utils.c                       |  130 +++++++++++
 shared/nm-vpn-plugin-utils.h                       |   40 ++++
 shared/utils.c                                     |    8 +-
 shared/utils.h                                     |    2 -
 src/nm-openvpn-service-openvpn-helper.c            |    5 +-
 src/nm-openvpn-service.c                           |   11 +-
 src/nm-openvpn-service.h                           |    6 -
 24 files changed, 624 insertions(+), 337 deletions(-)
---