diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:09:27 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:18:39 +0200 |
| commit | 820498b2158e0b05421ce0922f203a0699927fa8 (patch) | |
| tree | 3bf6d1089b762535ec5e59738d47ae2d2f54750f /src/nm-config.h | |
| parent | 1bd9f376796563dfb5016bada66c78b203f41d33 (diff) | |
| parent | 488dda3930545969f5644b57cfca81e21df031c3 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'src/nm-config.h')
| -rw-r--r-- | src/nm-config.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 66f1b69c..32ce236f 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager -- Network link manager * * This program is free software; you can redistribute it and/or modify @@ -157,7 +156,6 @@ NMConfigData *nm_config_get_data_orig (NMConfig *config); #define NM_CONFIG_GET_DATA (nm_config_get_data (nm_config_get ())) #define NM_CONFIG_GET_DATA_ORIG (nm_config_get_data_orig (nm_config_get ())) -gboolean nm_config_get_monitor_connection_files (NMConfig *config); const char *nm_config_get_log_level (NMConfig *config); const char *nm_config_get_log_domains (NMConfig *config); NMConfigConfigureAndQuitType nm_config_get_configure_and_quit (NMConfig *config); @@ -270,6 +268,7 @@ gboolean nm_config_device_state_write (int ifindex, int nm_owned, guint32 route_metric_default_aspired, guint32 route_metric_default_effective, + const char *next_server, const char *root_path); void nm_config_device_state_prune_unseen (GHashTable *seen_ifindexes); |