[network-manager-openconnect: 15/15] merge branch	'th/vpn-editor-split-bgo767690'
- From: Thomas Haller <thaller src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [network-manager-openconnect: 15/15] merge branch	'th/vpn-editor-split-bgo767690'
 
- Date: Thu, 16 Jun 2016 15:24:54 +0000 (UTC)
 
commit 2ead6c4bbb05e2e14869b815e860696dc775a185
Merge: a2d1268 aab0a72
Author: Thomas Haller <thaller redhat com>
Date:   Thu Jun 16 17:22:45 2016 +0200
    merge branch 'th/vpn-editor-split-bgo767690'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767690
 .gitignore                                         |    1 +
 Makefile.am                                        |   15 +-
 auth-dialog/Makefile.am                            |    4 +-
 auth-dialog/main.c                                 |   11 +-
 configure.ac                                       |  107 ++-
 po/POTFILES.in                                     |    4 +-
 properties/Makefile.am                             |  105 ++-
 properties/auth-helpers.c                          |   12 +-
 properties/auth-helpers.h                          |    9 -
 properties/libnm-openconnect-properties.ver        |    6 +
 properties/libnm-vpn-plugin-openconnect-editor.ver |    6 +
 properties/libnm-vpn-plugin-openconnect.ver        |    6 +
 properties/nm-openconnect-editor-plugin.c          |  542 +++++++++++
 ...penconnect.h => nm-openconnect-editor-plugin.h} |   37 +-
 properties/nm-openconnect-editor.c                 |  522 ++++++++++
 properties/nm-openconnect-editor.h                 |   47 +
 properties/nm-openconnect.c                        |  999 --------------------
 shared/Makefile.am                                 |    6 +
 shared/README                                      |    9 +
 shared/nm-default.h                                |  103 ++
 .../nm-service-defines.h                           |    6 +-
 shared/nm-utils/nm-glib.h                          |  397 ++++++++
 shared/nm-utils/nm-macros-internal.h               |   10 +-
 shared/nm-utils/nm-vpn-editor-plugin-call.h        |    1 -
 shared/nm-utils/nm-vpn-plugin-utils.c              |  130 +++
 shared/nm-utils/nm-vpn-plugin-utils.h              |   42 +
 src/Makefile.am                                    |   17 +-
 src/nm-openconnect-service-openconnect-helper.c    |    7 +-
 src/nm-openconnect-service.c                       |   10 +-
 src/nm-openconnect-service.h                       |    6 -
 30 files changed, 2029 insertions(+), 1148 deletions(-)
---
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]