New upstream version 1.5.90 upstream/1.5.90

1 files changed, 8 insertions, 14 deletions

diff --git a/src/devices/wwan/nm-modem-manager.h b/src/devices/wwan/nm-modem-manager.h
index b0014c6a..65594dfa 100644
--- a/src/devices/wwan/nm-modem-manager.h
+++ b/src/devices/wwan/nm-modem-manager.h
@@ -25,23 +25,17 @@
 
 #include "nm-modem.h"
 
-#define NM_TYPE_MODEM_MANAGER (nm_modem_manager_get_type ())
-#define NM_MODEM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_MANAGER, NMModemManager))
+#define NM_TYPE_MODEM_MANAGER                   (nm_modem_manager_get_type ())
+#define NM_MODEM_MANAGER(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_MANAGER, NMModemManager))
+#define NM_MODEM_MANAGER_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_MODEM_MANAGER, NMModemManagerClass))
+#define NM_IS_MODEM_MANAGER(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_MANAGER))
+#define NM_IS_MODEM_MANAGER_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_MODEM_MANAGER))
+#define NM_MODEM_MANAGER_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_MODEM_MANAGER, NMModemManagerClass))
 
 #define NM_MODEM_MANAGER_MODEM_ADDED "modem-added"
 
-typedef struct _NMModemManagerPrivate NMModemManagerPrivate;
-
-typedef struct {
-	GObject parent;
-	NMModemManagerPrivate *priv;
-} NMModemManager;
-
-typedef struct {
-	GObjectClass parent;
-
-	void (*modem_added) (NMModemManager *self, NMModem *modem);
-} NMModemManagerClass;
+typedef struct _NMModemManager NMModemManager;
+typedef struct _NMModemManagerClass NMModemManagerClass;
 
 GType nm_modem_manager_get_type (void);