diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
| commit | 511e94811644318cc196e197616fdc558030e8e3 (patch) | |
| tree | 1ea5c895be190982cc686d43ebed62ae33d60426 /src/nm-config.h | |
| parent | fb15332b981b5637ae4aeadc546e2f46bf333cd1 (diff) | |
| parent | d6201f5d8daada3d64a0a3e0038e14eebec683ce (diff) | |
Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
Diffstat (limited to 'src/nm-config.h')
| -rw-r--r-- | src/nm-config.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 8bbab2ac..9a153e48 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -22,12 +22,8 @@ #ifndef __NETWORKMANAGER_CONFIG_H__ #define __NETWORKMANAGER_CONFIG_H__ - -#include "nm-default.h" #include "nm-config-data.h" -G_BEGIN_DECLS - #define NM_TYPE_CONFIG (nm_config_get_type ()) #define NM_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONFIG, NMConfig)) #define NM_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONFIG, NMConfigClass)) @@ -129,7 +125,7 @@ void nm_config_set_no_auto_default_for_device (NMConfig *config, NMDevice *devi NMConfig *nm_config_new (const NMConfigCmdLineOptions *cli, char **atomic_section_prefixes, GError **error); NMConfig *nm_config_setup (const NMConfigCmdLineOptions *cli, char **atomic_section_prefixes, GError **error); -void nm_config_reload (NMConfig *config, int signal); +void nm_config_reload (NMConfig *config, NMConfigChangeFlags reload_flags); gint nm_config_parse_boolean (const char *str, gint default_value); @@ -159,7 +155,5 @@ gboolean nm_config_set_global_dns (NMConfig *self, NMGlobalDnsConfig *global_dns extern guint _nm_config_match_nm_version; extern char *_nm_config_match_env; -G_END_DECLS - #endif /* __NETWORKMANAGER_CONFIG_H__ */ |