diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
| commit | f1c906035c6ea7eb635664835c153aed553dc2e5 (patch) | |
| tree | 7b870b6cef1f902486dc706084124c6964b342a6 /src/settings/nm-settings.h | |
| parent | d6158994abe7b2be73443f933ed7fdcc40954c24 (diff) | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
Merge tag 'debian/1.10.4-1' into bionic
network-manager Debian release 1.10.4-1
Diffstat (limited to 'src/settings/nm-settings.h')
| -rw-r--r-- | src/settings/nm-settings.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h index eede76b0..0ecffb70 100644 --- a/src/settings/nm-settings.h +++ b/src/settings/nm-settings.h @@ -46,8 +46,7 @@ #define NM_SETTINGS_SIGNAL_CONNECTION_ADDED "connection-added" #define NM_SETTINGS_SIGNAL_CONNECTION_UPDATED "connection-updated" #define NM_SETTINGS_SIGNAL_CONNECTION_REMOVED "connection-removed" -#define NM_SETTINGS_SIGNAL_CONNECTION_VISIBILITY_CHANGED "connection-visibility-changed" -#define NM_SETTINGS_SIGNAL_AGENT_REGISTERED "agent-registered" +#define NM_SETTINGS_SIGNAL_CONNECTION_FLAGS_CHANGED "connection-flags-changed" /** * NMConnectionFilterFunc: @@ -100,10 +99,9 @@ NMSettingsConnection *const* nm_settings_get_connections (NMSettings *settings, NMSettingsConnection **nm_settings_get_connections_clone (NMSettings *self, guint *out_len, NMSettingsConnectionFilterFunc func, - gpointer func_data); - -NMSettingsConnection **nm_settings_get_connections_sorted (NMSettings *self, - guint *out_len); + gpointer func_data, + GCompareDataFunc sort_compare_func, + gpointer sort_data); NMSettingsConnection *nm_settings_add_connection (NMSettings *settings, NMConnection *connection, |