From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- clients/common/nm-polkit-listener.c | 3 +-- clients/common/nm-secret-agent-simple.c | 7 +++---- clients/common/nm-vpn-helpers.c | 8 +++----- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'clients/common') diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 9646374e..9c67760b 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -31,13 +31,12 @@ * https://github.com/lxde/lxqt-policykit/tree/master/src */ -#include "config.h" +#include "nm-default.h" #include #include #include -#include "nm-default.h" #include "nm-polkit-listener.h" G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER) diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 233e1409..721f980e 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -29,14 +29,13 @@ * replace ShellNetworkAgent. */ -#include "config.h" +#include "nm-default.h" #include -#include -#include +#include "NetworkManager.h" +#include "nm-vpn-service-plugin.h" -#include "nm-default.h" #include "nm-vpn-helpers.h" #include "nm-secret-agent-simple.h" diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 36e8e6b2..1d2a6b0f 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -23,16 +23,14 @@ * Some functions should probably eventually move into libnm. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-vpn-helpers.h" #include #include -#include "nm-default.h" #include "nm-utils.h" -#include "nm-vpn-helpers.h" - -#include "nm-macros-internal.h" static gboolean plugins_loaded; static GSList *plugins = NULL; -- cgit 1.3.0-6-gf8a5