fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-03 07:48:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: move nm_device_interface_activate() to nm-device.c

Browse source
This commit is contained in:
Dan Williams 2011-11-17 23:50:13 -06:00
parent dcce47bea6
commit 3caf0c80e4
5 changed files with 21 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nm-device-interface.c
View file

@ -275,46 +275,6 @@ nm_device_interface_get_type (void)
return device_interface_type;
}
/* FIXME: This should be public and nm_device_get_iface() should be removed. */
static char *
nm_device_interface_get_iface (NMDeviceInterface *device)
{
char *iface = NULL;
g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), NULL);
g_object_get (device, NM_DEVICE_INTERFACE_IFACE, &iface, NULL);
return iface;
}
gboolean
nm_device_interface_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error)
{
gboolean success;
NMConnection *connection;
char *iface;
g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE);
g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
connection = nm_act_request_get_connection (req);
g_assert (connection);
iface = nm_device_interface_get_iface (device);
nm_log_info (LOGD_DEVICE, "Activation (%s) starting connection '%s'", iface,
nm_connection_get_id (connection));
g_free (iface);
success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error);
if (!success)
g_assert (*error);
return success;
}
static void
impl_device_disconnect (NMDeviceInterface *device,
DBusGMethodInvocation *context)

8
src/nm-device-interface.h
View file

@ -93,10 +93,6 @@ struct _NMDeviceInterface {
GTypeInterface g_iface;
/* Methods */
gboolean (*activate) (NMDeviceInterface *device,
NMActRequest *req,
GError **error);
void (*deactivate) (NMDeviceInterface *device, NMDeviceStateReason reason);
/* Signals */
@ -111,10 +107,6 @@ GType nm_device_interface_error_get_type (void);
GType nm_device_interface_get_type (void);
gboolean nm_device_interface_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error);
void nm_device_interface_deactivate (NMDeviceInterface *device, NMDeviceStateReason reason);
#endif /* NM_DEVICE_INTERFACE_H */

28
src/nm-device.c
View file

@ -168,9 +168,6 @@ typedef struct {
NMDevice * master;
} NMDevicePrivate;
static gboolean nm_device_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error);
static void nm_device_deactivate (NMDeviceInterface *device, NMDeviceStateReason reason);
static void nm_device_take_down (NMDevice *dev, gboolean wait, NMDeviceStateReason reason);
@ -198,7 +195,6 @@ static void
device_interface_init (NMDeviceInterface *device_interface_class)
{
/* interface implementation */
device_interface_class->activate = nm_device_activate;
device_interface_class->deactivate = nm_device_deactivate;
}
@ -3004,13 +3000,25 @@ nm_device_disconnect (NMDevice *device, GError **error)
return TRUE;
}
static gboolean
nm_device_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error)
gboolean
nm_device_activate (NMDevice *self, NMActRequest *req, GError **error)
{
NMDevice *self = NM_DEVICE (device);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMDevicePrivate *priv;
NMConnection *connection;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
g_return_val_if_fail (req != NULL, FALSE);
g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
priv = NM_DEVICE_GET_PRIVATE (self);
connection = nm_act_request_get_connection (req);
g_assert (connection);
nm_log_info (LOGD_DEVICE, "Activation (%s) starting connection '%s'",
nm_device_get_iface (self),
nm_connection_get_id (connection));
/* Make sure this connection isn't activated already, or in the process of
* being activated.

2
src/nm-device.h
View file

@ -198,6 +198,8 @@ void nm_device_state_changed (NMDevice *device,
gboolean nm_device_get_firmware_missing (NMDevice *self);
gboolean nm_device_activate (NMDevice *device, NMActRequest *req, GError **error);
gboolean nm_device_disconnect (NMDevice *device, GError **error);
G_END_DECLS

2
src/nm-manager.c
View file

@ -1986,7 +1986,7 @@ internal_activate_device (NMManager *manager,
sender_uid,
assumed,
(gpointer) device);
success = nm_device_interface_activate (NM_DEVICE_INTERFACE (device), req, error);
success = nm_device_activate (device, req, error);
g_object_unref (req);
return success ? nm_act_request_get_active_connection_path (req) : NULL;