[network-manager-openvpn: 10/10] all: merge branch 'th/include-nm-default-bgo761198'
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn: 10/10] all: merge branch 'th/include-nm-default-bgo761198'
- Date: Thu, 28 Jan 2016 10:02:58 +0000 (UTC)
commit 92c37d60a61ae4b09b58e6e88532eb8f23caa4f2
Merge: bc3497f 79eea4b
Author: Thomas Haller <thaller redhat com>
Date: Thu Jan 28 10:59:03 2016 +0100
all: merge branch 'th/include-nm-default-bgo761198'
- cleanup project layout and includes.
- add "shared" directory with utility functions copied from
NetworkManager's repository.
- merge "common" directory into "shared".
- re-enable tests for libnm-glib based properties library.
https://bugzilla.gnome.org/show_bug.cgi?id=761198
.gitignore | 5 +
Makefile.am | 5 +-
auth-dialog/Makefile.am | 3 +-
auth-dialog/main.c | 12 +-
common/Makefile.am | 29 --
common/nm-glib-compat.h | 49 ----
configure.ac | 2 +-
properties/Makefile.am | 9 +-
properties/auth-helpers.c | 29 +--
properties/import-export.c | 36 +---
properties/nm-openvpn.c | 29 +--
properties/tests/Makefile.am | 37 +++-
properties/tests/test-import-export.c | 223 +++++++++-------
shared/Makefile.am | 36 +++
shared/gsystem-local-alloc.h | 208 ++++++++++++++
shared/nm-dbus-compat.h | 74 +++++
shared/nm-default.h | 153 +++++++++++
shared/nm-glib.h | 356 ++++++++++++++++++++++++
shared/nm-macros-internal.h | 374 ++++++++++++++++++++++++++
{src => shared}/nm-openvpn-service-defines.h | 0
nm-test-helpers.h => shared/nm-test-utils.h | 0
{common => shared}/utils.c | 9 +-
{common => shared}/utils.h | 0
src/Makefile.am | 5 +-
src/nm-openvpn-service-openvpn-helper.c | 6 +-
src/nm-openvpn-service.c | 13 +-
26 files changed, 1409 insertions(+), 293 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]