about summary refs log tree commit diff
path: root/src/devices/wifi/nm-device-wifi.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/wifi/nm-device-wifi.h')
-rw-r--r--src/devices/wifi/nm-device-wifi.h47
1 files changed, 8 insertions, 39 deletions
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h
index 7e0d06f5..ba9d60e2 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/devices/wifi/nm-device-wifi.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 - 2010 Red Hat, Inc.
+ * Copyright (C) 2005 - 2016 Red Hat, Inc.
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
@@ -25,18 +25,13 @@
 #include "nm-device.h"
 #include "nm-wifi-ap.h"
 
-struct NMAccessPointList;
+#define NM_TYPE_DEVICE_WIFI             (nm_device_wifi_get_type ())
+#define NM_DEVICE_WIFI(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WIFI, NMDeviceWifi))
+#define NM_DEVICE_WIFI_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass))
+#define NM_IS_DEVICE_WIFI(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WIFI))
+#define NM_IS_DEVICE_WIFI_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_DEVICE_WIFI))
+#define NM_DEVICE_WIFI_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass))
 
-G_BEGIN_DECLS
-
-#define NM_TYPE_DEVICE_WIFI			(nm_device_wifi_get_type ())
-#define NM_DEVICE_WIFI(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WIFI, NMDeviceWifi))
-#define NM_DEVICE_WIFI_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass))
-#define NM_IS_DEVICE_WIFI(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WIFI))
-#define NM_IS_DEVICE_WIFI_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_DEVICE_WIFI))
-#define NM_DEVICE_WIFI_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass))
-
-#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 #define NM_DEVICE_WIFI_MODE                "mode"
 #define NM_DEVICE_WIFI_BITRATE             "bitrate"
 #define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
@@ -44,37 +39,11 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 #define NM_DEVICE_WIFI_SCANNING            "scanning"
 
-#ifndef NM_DEVICE_WIFI_DEFINED
-#define NM_DEVICE_WIFI_DEFINED
 typedef struct _NMDeviceWifi NMDeviceWifi;
-#endif
-
 typedef struct _NMDeviceWifiClass NMDeviceWifiClass;
-typedef struct _NMDeviceWifiPrivate NMDeviceWifiPrivate;
-
-struct _NMDeviceWifi
-{
-	NMDevice parent;
-
-	/*< private >*/
-	NMDeviceWifiPrivate *priv;
-};
-
-struct _NMDeviceWifiClass
-{
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*access_point_added)   (NMDeviceWifi *device, NMAccessPoint *ap);
-	void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap);
-	gboolean (*scanning_allowed) (NMDeviceWifi *device);
-};
-
 
 GType nm_device_wifi_get_type (void);
 
 NMDevice * nm_device_wifi_new (const char *iface, NMDeviceWifiCapabilities capabilities);
 
-G_END_DECLS
-
-#endif	/* NM_DEVICE_WIFI_H */
+#endif /* __NETWORKMANAGER_DEVICE_WIFI_H__ */