[network-manager-vpnc: 20/20] all: merge branch 'th/vpn-editor-split-bgo766170'



commit 7aedb95661d7d0043625592266fcbdcf54752a81
Merge: df4bacc 46a5839
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 17 18:39:50 2016 +0200

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

 .gitignore                                         |   11 +
 Makefile.am                                        |   22 +-
 auth-dialog/Makefile.am                            |    1 +
 auth-dialog/main.c                                 |    9 +-
 configure.ac                                       |   84 +-
 nm-test-helpers.h                                  |   51 -
 po/POTFILES.in                                     |    5 +-
 properties/Makefile.am                             |  133 +-
 properties/libnm-vpn-plugin-vpnc-editor.ver        |    6 +
 properties/libnm-vpn-plugin-vpnc.ver               |    6 +
 properties/libnm-vpnc-properties.ver               |    6 +
 properties/nm-vpnc-editor-plugin.c                 |  906 +++++++++
 properties/{nm-vpnc.h => nm-vpnc-editor-plugin.h}  |   36 +-
 properties/nm-vpnc-editor.c                        | 1054 +++++++++++
 properties/{nm-vpnc.h => nm-vpnc-editor.h}         |   33 +-
 properties/nm-vpnc-helper.c                        |    8 +-
 properties/nm-vpnc.c                               | 1918 --------------------
 properties/tests/Makefile.am                       |   46 +-
 properties/tests/test-import-export.c              |  540 +++----
 shared/Makefile.am                                 |   60 +
 shared/README                                      |   24 +
 shared/nm-default.h                                |  130 ++
 .../nm-service-defines.h                           |    9 +-
 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-utils/nm-test-utils.h                    | 1743 ++++++++++++++++++
 shared/nm-vpn/nm-vpn-plugin-utils.c                |  130 ++
 shared/nm-vpn/nm-vpn-plugin-utils.h                |   40 +
 src/Makefile.am                                    |    9 +-
 src/nm-vpnc-service-vpnc-helper.c                  |    7 +-
 src/nm-vpnc-service.c                              |    9 +-
 src/nm-vpnc-service.h                              |    6 -
 src/test-vpnc-output.c                             |    9 +-
 src/utils.c                                        |    5 +-
 src/utils.h                                        |    2 -
 38 files changed, 6069 insertions(+), 2470 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]