diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /src/nm-manager.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 5a462846..11cba1a5 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -98,10 +98,12 @@ const CList * nm_manager_get_active_connections (NMManager *manager); iter = c_list_entry (iter->active_connections_lst.next, NMActiveConnection, active_connections_lst)) NMSettingsConnection **nm_manager_get_activatable_connections (NMManager *manager, - guint *out_len, - gboolean sort); + gboolean for_auto_activation, + gboolean sort, + guint *out_len); -void nm_manager_write_device_state (NMManager *manager); +void nm_manager_write_device_state_all (NMManager *manager); +gboolean nm_manager_write_device_state (NMManager *manager, NMDevice *device); /* Device handling */ |