diff options
Diffstat (limited to 'src/nm-device.h')
| -rw-r--r-- | src/nm-device.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/nm-device.h b/src/nm-device.h index 1d080eda5..db2b1b7db 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2011 Red Hat, Inc. + * Copyright (C) 2005 - 2010 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. */ @@ -84,14 +84,13 @@ typedef struct { GSList *connections, char **specific_object); - gboolean (* check_connection_compatible) (NMDevice *self, - NMConnection *connection, - GError **error); + void (* connection_secrets_updated) (NMDevice *self, + NMConnection *connection, + GSList *updated_settings, + RequestSecretsCaller caller); - gboolean (* complete_connection) (NMDevice *self, + gboolean (* check_connection_compatible) (NMDevice *self, NMConnection *connection, - const char *specific_object, - const GSList *existing_connections, GError **error); NMActStageReturn (* act_stage1_prepare) (NMDevice *self, @@ -115,6 +114,7 @@ typedef struct { NMIP6Config **config, NMDeviceStateReason *reason); void (* deactivate) (NMDevice *self); + void (* deactivate_quickly) (NMDevice *self); gboolean (* can_interrupt_activation) (NMDevice *self); @@ -162,18 +162,13 @@ NMConnection * nm_device_get_best_auto_connection (NMDevice *dev, GSList *connections, char **specific_object); -gboolean nm_device_complete_connection (NMDevice *device, - NMConnection *connection, - const char *specific_object, - const GSList *existing_connection, - GError **error); - void nm_device_activate_schedule_stage1_device_prepare (NMDevice *device); void nm_device_activate_schedule_stage2_device_config (NMDevice *device); void nm_device_activate_schedule_stage4_ip4_config_get (NMDevice *device); void nm_device_activate_schedule_stage4_ip4_config_timeout (NMDevice *device); void nm_device_activate_schedule_stage4_ip6_config_get (NMDevice *device); void nm_device_activate_schedule_stage4_ip6_config_timeout (NMDevice *device); +gboolean nm_device_deactivate_quickly (NMDevice *dev); gboolean nm_device_is_activating (NMDevice *dev); gboolean nm_device_can_interrupt_activation (NMDevice *self); gboolean nm_device_autoconnect_allowed (NMDevice *self); @@ -190,8 +185,6 @@ void nm_device_set_dhcp_anycast_address (NMDevice *device, guint8 *addr); void nm_device_clear_autoconnect_inhibit (NMDevice *device); -gboolean nm_device_dhcp4_renew (NMDevice *device, gboolean release); - G_END_DECLS #endif /* NM_DEVICE_H */ |