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

core: move state-changed signal to nm-device.c

Browse source
This commit is contained in:
Dan Williams 2011-11-18 00:09:37 -06:00
parent 905f2cdf9a
commit 296b488ad4
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,15 +187,6 @@ nm_device_interface_init (gpointer g_iface)
G_PARAM_READABLE | NM_PROPERTY_PARAM_NO_EXPORT)); G_PARAM_READABLE | NM_PROPERTY_PARAM_NO_EXPORT));
/* Signals */ /* Signals */
g_signal_new ("state-changed",
iface_type,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMDeviceInterface, state_changed),
NULL, NULL,
_nm_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE, 3,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
g_signal_new (NM_DEVICE_INTERFACE_DISCONNECT_REQUEST, g_signal_new (NM_DEVICE_INTERFACE_DISCONNECT_REQUEST,
iface_type, iface_type,
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,

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

@ -81,12 +81,6 @@ typedef struct _NMDeviceInterface NMDeviceInterface;
struct _NMDeviceInterface { struct _NMDeviceInterface {
GTypeInterface g_iface; GTypeInterface g_iface;
/* Signals */
void (*state_changed) (NMDeviceInterface *device,
NMDeviceState new_state,
NMDeviceState old_state,
NMDeviceStateReason reason);
}; };
GType nm_device_interface_get_type (void); GType nm_device_interface_get_type (void);

10
src/nm-device.c
View file

@ -109,6 +109,7 @@ nm_device_error_get_type (void)
G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, G_TYPE_OBJECT) G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, G_TYPE_OBJECT)
enum { enum {
STATE_CHANGED,
AUTOCONNECT_ALLOWED, AUTOCONNECT_ALLOWED,
LAST_SIGNAL, LAST_SIGNAL,
}; };
@ -3745,6 +3746,15 @@ nm_device_class_init (NMDeviceClass *klass)
NM_DEVICE_INTERFACE_PROP_RFKILL_TYPE, NM_DEVICE_INTERFACE_PROP_RFKILL_TYPE,
NM_DEVICE_INTERFACE_RFKILL_TYPE); NM_DEVICE_INTERFACE_RFKILL_TYPE);
signals[STATE_CHANGED] =
g_signal_new ("state-changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
0, NULL, NULL,
_nm_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE, 3,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
signals[AUTOCONNECT_ALLOWED] = signals[AUTOCONNECT_ALLOWED] =
g_signal_new ("autoconnect-allowed", g_signal_new ("autoconnect-allowed",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),

5
src/nm-device.h
View file

@ -52,6 +52,11 @@ typedef struct {
typedef struct { typedef struct {
GObjectClass parent; GObjectClass parent;
void (*state_changed) (NMDevice *device,
NMDeviceState new_state,
NMDeviceState old_state,
NMDeviceStateReason reason);
/* Hardware state, ie IFF_UP */ /* Hardware state, ie IFF_UP */
gboolean (*hw_is_up) (NMDevice *self); gboolean (*hw_is_up) (NMDevice *self);
gboolean (*hw_bring_up) (NMDevice *self, gboolean *no_firmware); gboolean (*hw_bring_up) (NMDevice *self, gboolean *no_firmware);