Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 2 insertions, 15 deletions

diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h
index 8afe6924..f46379ff 100644
--- a/src/devices/bluetooth/nm-bluez4-manager.h
+++ b/src/devices/bluetooth/nm-bluez4-manager.h
@@ -28,20 +28,8 @@
 #define NM_IS_BLUEZ4_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ4_MANAGER))
 #define NM_BLUEZ4_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ4_MANAGER, NMBluez4ManagerClass))
 
-typedef struct {
-	GObject parent;
-} NMBluez4Manager;
-
-typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*bdaddr_added) (NMBluez4Manager *manager,
-	                      const char *bdaddr,
-	                      const char *name,
-	                      const char *object_path,
-	                      guint uuids);
-} NMBluez4ManagerClass;
+typedef struct _NMBluez4Manager NMBluez4Manager;
+typedef struct _NMBluez4ManagerClass NMBluez4ManagerClass;
 
 GType nm_bluez4_manager_get_type (void);
 
@@ -50,4 +38,3 @@ NMBluez4Manager *nm_bluez4_manager_new (NMSettings *settings);
 void nm_bluez4_manager_query_devices (NMBluez4Manager *manager);
 
 #endif /* __NETWORKMANAGER_BLUEZ4_MANAGER_H__ */
-