diff options
author | Dan Williams <dcbw@redhat.com> | 2007-09-11 18:02:27 +0000 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-09-11 18:02:27 +0000 |
commit | 937d1add737a4f7dcaeaaf1096fa0c0ae5764cc0 (patch) | |
tree | 988347befe815c742669bb8cf46d592c6956590a /libnm-util/nm-setting.h | |
parent | d52a52421a388b56bc73d07593592646acd31871 (diff) | |
download | NetworkManager-937d1add737a4f7dcaeaaf1096fa0c0ae5764cc0.tar.gz |
2007-09-11 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c
libnm-util/nm-setting.h
- (nm_setting_update_secrets): new function; add a virtual function that
subclasses can implement to update their secrets
- (setting_wireless_security_update_secrets): implement that function
for the 802-11-wireless-security subclass
* libnm-util/nm-connection.c
libnm-util/nm-connection.h
- (nm_connection_update_secrets): update secrets for a Setting and
emit a signal on success
* src/nm-manager.c
src/nm-manager.h
src/nm-marshal.list
- (connection_get_settings_cb): enable system settings bits
- (nm_manager_get_connection_secrets, get_secrets_cb): add function
to request secrets from the settings dbus service and to
push those secrets to the NMConnection itself
* src/nm-activation-request.c
src/nm-activation-request.h
- Attach to the 'secrets-updated' signal of the NMConnection that's
currently being activated, and proxy that signal to other listeners.
Goes through the activation request because the activation request
is the thing that manages the lifetime of the NMConnection that's
being activated.
* src/nm-device-802-11-wireless.c
- (real_connection_secrets_updated): implement the connection secrets
updated notification and restart activation when secrets are
received
- (real_act_stage2_config): request secrets from the settings dbus
service if secrets are needed
* src/nm-device.c
src/nm-device.h
- (clear_act_request, nm_device_activation_cancel,
nm_device_deactivate_quickly, nm_device_dispose): consolidate places
where the activation request is cleared
- (nm_device_activate, connection_secrets_updated_cb): attach to the
updated secrets signal of activation request and add a function
that subclasses can override to handle it easily
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2782 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting.h')
-rw-r--r-- | libnm-util/nm-setting.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 1f41ffbf64..f47a871837 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -15,6 +15,9 @@ typedef gboolean (*NMSettingVerifyFn) (NMSetting *setting, typedef GHashTable *(*NMSettingToHashFn) (NMSetting *setting); +typedef gboolean (*NMSettingUpdateSecretsFn) (NMSetting *setting, + GHashTable *secrets); + typedef void (*NMSettingDestroyFn) (NMSetting *setting); struct _NMSetting { @@ -22,11 +25,13 @@ struct _NMSetting { NMSettingVerifyFn verify_fn; NMSettingToHashFn hash_fn; + NMSettingUpdateSecretsFn update_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); void nm_setting_destroy (NMSetting *setting); /* Default, built-in settings */ |