diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /libnm-core/nm-setting-proxy.h | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'libnm-core/nm-setting-proxy.h')
| -rw-r--r-- | libnm-core/nm-setting-proxy.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-proxy.h b/libnm-core/nm-setting-proxy.h index 2009dfab..0c72799f 100644 --- a/libnm-core/nm-setting-proxy.h +++ b/libnm-core/nm-setting-proxy.h @@ -26,7 +26,7 @@ #error "Only <NetworkManager.h> can be included directly." #endif -#include <nm-setting.h> +#include "nm-setting.h" G_BEGIN_DECLS @@ -58,6 +58,11 @@ typedef enum { #define NM_SETTING_PROXY_PAC_URL "pac-url" #define NM_SETTING_PROXY_PAC_SCRIPT "pac-script" +/** + * NMSettingProxy: + * + * WWW Proxy Settings + */ struct _NMSettingProxy { NMSetting parent; }; |