libmm-glib,cdma: `MMModemCdma' is now a real object

Not just a typedef of the gdbus-codegen generated `MmGdbusModemCdma'.

1 files changed, 45 insertions, 7 deletions

diff --git a/libmm-glib/mm-modem-cdma.h b/libmm-glib/mm-modem-cdma.h
index 76fe9f9e..86b28eb0 100644
--- a/libmm-glib/mm-modem-cdma.h
+++ b/libmm-glib/mm-modem-cdma.h
@@ -17,7 +17,8 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org>
+ * Copyright (C) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org>
+ * Copyright (C) 2012 Google, Inc.
  */
 
 #ifndef _MM_MODEM_CDMA_H_
@@ -28,23 +29,60 @@
 
 G_BEGIN_DECLS
 
-#define MM_MODEM_CDMA_SID_UNKNOWN 99999
-#define MM_MODEM_CDMA_NID_UNKNOWN 99999
+#define MM_TYPE_MODEM_CDMA            (mm_modem_cdma_get_type ())
+#define MM_MODEM_CDMA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_CDMA, MMModemCdma))
+#define MM_MODEM_CDMA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_CDMA, MMModemCdmaClass))
+#define MM_IS_MODEM_CDMA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_CDMA))
+#define MM_IS_MODEM_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MODEM_CDMA))
+#define MM_MODEM_CDMA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_CDMA, MMModemCdmaClass))
+
+typedef struct _MMModemCdma MMModemCdma;
+typedef struct _MMModemCdmaClass MMModemCdmaClass;
 
-typedef MmGdbusModemCdma      MMModemCdma;
-#define MM_TYPE_MODEM_CDMA(o) MM_GDBUS_TYPE_MODEM_CDMA (o)
-#define MM_MODEM_CDMA(o)      MM_GDBUS_MODEM_CDMA(o)
-#define MM_IS_MODEM_CDMA(o)   MM_GDBUS_IS_MODEM_CDMA(o)
+/**
+ * MMModemCdma:
+ *
+ * The #MMModemCdma structure contains private data and should only be accessed
+ * using the provided API.
+ */
+struct _MMModemCdma {
+    /*< private >*/
+    MmGdbusModemCdmaProxy parent;
+    gpointer unused;
+};
+
+struct _MMModemCdmaClass {
+    /*< private >*/
+    MmGdbusModemCdmaProxyClass parent;
+};
+
+GType mm_modem_cdma_get_type (void);
 
 const gchar *mm_modem_cdma_get_path (MMModemCdma *self);
 gchar       *mm_modem_cdma_dup_path (MMModemCdma *self);
 
 const gchar *mm_modem_cdma_get_meid (MMModemCdma *self);
 gchar       *mm_modem_cdma_dup_meid (MMModemCdma *self);
+
 const gchar *mm_modem_cdma_get_esn  (MMModemCdma *self);
 gchar       *mm_modem_cdma_dup_esn  (MMModemCdma *self);
+
+/**
+ * MM_MODEM_CDMA_SID_UNKNOWN:
+ *
+ * Identifier for an unknown SID.
+ */
+#define MM_MODEM_CDMA_SID_UNKNOWN 99999
 guint        mm_modem_cdma_get_sid  (MMModemCdma *self);
+
+/**
+ * MM_MODEM_CDMA_NID_UNKNOWN:
+ *
+ * Identifier for an unknown NID.
+ */
+#define MM_MODEM_CDMA_NID_UNKNOWN 99999
 guint        mm_modem_cdma_get_nid  (MMModemCdma *self);
+
 MMModemCdmaRegistrationState mm_modem_cdma_get_cdma1x_registration_state (MMModemCdma *self);
 MMModemCdmaRegistrationState mm_modem_cdma_get_evdo_registration_state   (MMModemCdma *self);