diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-09-11 18:28:36 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-09-11 18:28:36 +0000 |
| commit | e705a7082e0793815fd41d4673c34ab762d005ef (patch) | |
| tree | 5b09413b1e16818f5796328d167fbf5a06b6d962 /libnm-util/nm-setting.h | |
| parent | 2e4cabc55e56bdf17ce99ef45c7e3f853089b9b2 (diff) | |
| download | NetworkManager-e705a7082e0793815fd41d4673c34ab762d005ef.tar.gz | |
2007-09-11 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-connection.c
- (nm_connection_update_secrets, need_secrets_check): move
802-11-wireless-security need_secrets checks to the setting object
itself, where it belongs
* libnm-util/nm-setting.c
libnm-util/nm-setting.h
- (nm_setting_need_secrets): new function
- (setting_wireless_security_verify,
nm_setting_wireless_security_new_from_hash): make 'key-mgmt' required
- (setting_wireless_security_need_secrets): mostly copy code over
from nm-connection.c
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2784 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting.h')
| -rw-r--r-- | libnm-util/nm-setting.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index f47a871837..9afaaf2c9a 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -18,6 +18,8 @@ typedef GHashTable *(*NMSettingToHashFn) (NMSetting *setting); typedef gboolean (*NMSettingUpdateSecretsFn) (NMSetting *setting, GHashTable *secrets); +typedef GPtrArray *(*NMSettingNeedSecretsFn) (NMSetting *setting); + typedef void (*NMSettingDestroyFn) (NMSetting *setting); struct _NMSetting { @@ -26,12 +28,14 @@ struct _NMSetting { NMSettingVerifyFn verify_fn; NMSettingToHashFn hash_fn; NMSettingUpdateSecretsFn update_secrets_fn; + NMSettingNeedSecretsFn need_secrets_fn; NMSettingDestroyFn destroy_fn; }; gboolean nm_settings_verify (GHashTable *all_settings); GHashTable *nm_setting_to_hash (NMSetting *setting); gboolean nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets); +GPtrArray * nm_setting_need_secrets (NMSetting *setting); void nm_setting_destroy (NMSetting *setting); /* Default, built-in settings */ |