diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-01-21 12:58:32 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-02-03 13:01:54 +0100 |
| commit | 5b47462f32489c726d6f79dfed431864d31f8dd2 (patch) | |
| tree | 52117994ae95d4c33999f2d45312915e73037c28 /src/nm-config-data.h | |
| parent | cc46b182ed779110f93b5df19f2f9d43dc476d1e (diff) | |
| download | NetworkManager-5b47462f32489c726d6f79dfed431864d31f8dd2.tar.gz | |
config: use flags argument in config-changed signal instead of a hash tableth/rh1066697_reload_config
Diffstat (limited to 'src/nm-config-data.h')
| -rw-r--r-- | src/nm-config-data.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/nm-config-data.h b/src/nm-config-data.h index 59b2806ccd..bb88bf7ea2 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -44,6 +44,17 @@ G_BEGIN_DECLS #define NM_CONFIG_DATA_CONNECTIVITY_RESPONSE "connectivity-response" #define NM_CONFIG_DATA_NO_AUTO_DEFAULT "no-auto-default" +typedef enum { /*< flags >*/ + NM_CONFIG_CHANGE_NONE = 0, + NM_CONFIG_CHANGE_CONFIG_FILES = (1L << 0), + NM_CONFIG_CHANGE_VALUES = (1L << 1), + NM_CONFIG_CHANGE_CONNECTIVITY = (1L << 2), + NM_CONFIG_CHANGE_NO_AUTO_DEFAULT = (1L << 3), + + _NM_CONFIG_CHANGE_LAST, + NM_CONFIG_CHANGE_ALL = ((_NM_CONFIG_CHANGE_LAST - 1) << 1) - 1, +} NMConfigChangeFlags; + struct _NMConfigData { GObject parent; }; @@ -60,7 +71,7 @@ NMConfigData *nm_config_data_new (const char *config_main_file, GKeyFile *keyfile); NMConfigData *nm_config_data_new_update_no_auto_default (const NMConfigData *base, const char *const*no_auto_default); -GHashTable *nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data); +NMConfigChangeFlags nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data); const char *nm_config_data_get_config_main_file (const NMConfigData *config_data); const char *nm_config_data_get_config_description (const NMConfigData *config_data); |