From 296b488ad43801ebc63592daf3f3bb02831bcf09 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 18 Nov 2011 00:09:37 -0600
Subject: [PATCH] core: move state-changed signal to nm-device.c

---
 src/nm-device-interface.c |  9 ---------
 src/nm-device-interface.h |  6 ------
 src/nm-device.c           | 10 ++++++++++
 src/nm-device.h           |  5 +++++
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/nm-device-interface.c b/src/nm-device-interface.c
index 848c98e836..bfac124ed3 100644
--- a/src/nm-device-interface.c
+++ b/src/nm-device-interface.c
@@ -187,15 +187,6 @@ nm_device_interface_init (gpointer g_iface)
 							G_PARAM_READABLE | NM_PROPERTY_PARAM_NO_EXPORT));
 
 	/* 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,
 	              iface_type,
 	              G_SIGNAL_RUN_FIRST,
diff --git a/src/nm-device-interface.h b/src/nm-device-interface.h
index 6ed9e1e3d4..8572b1c514 100644
--- a/src/nm-device-interface.h
+++ b/src/nm-device-interface.h
@@ -81,12 +81,6 @@ typedef struct _NMDeviceInterface NMDeviceInterface;
 
 struct _NMDeviceInterface {
 	GTypeInterface g_iface;
-
-	/* Signals */
-	void (*state_changed) (NMDeviceInterface *device,
-	                       NMDeviceState new_state,
-	                       NMDeviceState old_state,
-	                       NMDeviceStateReason reason);
 };
 
 GType nm_device_interface_get_type (void);
diff --git a/src/nm-device.c b/src/nm-device.c
index e888a5bfd3..80828dc985 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -109,6 +109,7 @@ nm_device_error_get_type (void)
 G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, G_TYPE_OBJECT)
 
 enum {
+	STATE_CHANGED,
 	AUTOCONNECT_ALLOWED,
 	LAST_SIGNAL,
 };
@@ -3745,6 +3746,15 @@ nm_device_class_init (NMDeviceClass *klass)
 	                                  NM_DEVICE_INTERFACE_PROP_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] =
 		g_signal_new ("autoconnect-allowed",
 		              G_OBJECT_CLASS_TYPE (object_class),
diff --git a/src/nm-device.h b/src/nm-device.h
index a414270e34..5bfd00b3a0 100644
--- a/src/nm-device.h
+++ b/src/nm-device.h
@@ -52,6 +52,11 @@ typedef struct {
 typedef struct {
 	GObjectClass parent;
 
+	void (*state_changed) (NMDevice *device,
+	                       NMDeviceState new_state,
+	                       NMDeviceState old_state,
+	                       NMDeviceStateReason reason);
+
 	/* Hardware state, ie IFF_UP */
 	gboolean        (*hw_is_up)      (NMDevice *self);
 	gboolean        (*hw_bring_up)   (NMDevice *self, gboolean *no_firmware);