[network-manager-fortisslvpn: 30/30] all: merge branch 'th/gtk-split-and-log-bgo771544'
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-fortisslvpn: 30/30] all: merge branch 'th/gtk-split-and-log-bgo771544'
- Date: Mon, 19 Sep 2016 13:44:55 +0000 (UTC)
commit 0f1c7c97d68e1d9e248c83391132ca1353e2abd7
Merge: b938b26 6ba3d1b
Author: Thomas Haller <thaller redhat com>
Date: Mon Sep 19 15:41:06 2016 +0200
all: merge branch 'th/gtk-split-and-log-bgo771544'
https://bugzilla.gnome.org/show_bug.cgi?id=771544
.gitignore | 4 +
Makefile.am | 47 +-
auth-dialog/Makefile.am | 25 +-
auth-dialog/main.c | 11 +-
configure.ac | 77 ++-
m4/compiler_options.m4 | 111 +++
m4/compiler_warnings.m4 | 34 -
m4/git-sha-record.m4 | 15 +
po/POTFILES.in | 5 +-
properties/Makefile.am | 122 +++-
properties/libnm-fortisslvpn-properties.ver | 6 +
properties/libnm-vpn-plugin-fortisslvpn-editor.ver | 6 +
properties/libnm-vpn-plugin-fortisslvpn.ver | 6 +
properties/nm-fortisslvpn-editor-plugin.c | 168 +++++
...ortisslvpn.h => nm-fortisslvpn-editor-plugin.h} | 38 +-
.../{nm-fortisslvpn.c => nm-fortisslvpn-editor.c} | 187 +----
properties/nm-fortisslvpn-editor.h | 45 ++
shared/Makefile.am | 11 +
shared/README | 9 +
shared/nm-default.h | 135 ++++
.../nm-service-defines.h | 6 +-
shared/nm-utils/gsystem-local-alloc.h | 208 ++++++
shared/nm-utils/nm-glib.h | 452 ++++++++++++
shared/nm-utils/nm-macros-internal.h | 721 ++++++++++++++++++++
shared/nm-utils/nm-shared-utils.c | 239 +++++++
shared/nm-utils/nm-shared-utils.h | 66 ++
shared/nm-utils/nm-vpn-plugin-macros.h | 93 +++
shared/nm-utils/nm-vpn-plugin-utils.c | 130 ++++
shared/nm-utils/nm-vpn-plugin-utils.h | 42 ++
src/Makefile.am | 90 ++-
src/nm-fortisslvpn-pppd-plugin.c | 118 ++--
src/nm-fortisslvpn-service.c | 155 +++--
src/nm-fortisslvpn-service.h | 7 -
33 files changed, 2955 insertions(+), 434 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]