diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /clients/common | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'clients/common')
| -rw-r--r-- | clients/common/nm-polkit-listener.c | 3 | ||||
| -rw-r--r-- | clients/common/nm-secret-agent-simple.c | 7 | ||||
| -rw-r--r-- | clients/common/nm-vpn-helpers.c | 8 |
3 files changed, 7 insertions, 11 deletions
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 <string.h> #include <stdio.h> #include <stdlib.h> -#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 <string.h> -#include <NetworkManager.h> -#include <nm-vpn-service-plugin.h> +#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 <string.h> #include <gmodule.h> -#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; |