libmm-glib,3gpp: `MMModem3gpp' is now a real object

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

1 files changed, 41 insertions, 6 deletions

diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h
index 5e4bded5..c9108c6f 100644
--- a/libmm-glib/mm-modem-3gpp.h
+++ b/libmm-glib/mm-modem-3gpp.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_3GPP_H_
@@ -28,23 +29,49 @@
 
 G_BEGIN_DECLS
 
-typedef struct _MMModem3gppNetwork MMModem3gppNetwork;
+#define MM_TYPE_MODEM_3GPP            (mm_modem_3gpp_get_type ())
+#define MM_MODEM_3GPP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_3GPP, MMModem3gpp))
+#define MM_MODEM_3GPP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_3GPP, MMModem3gppClass))
+#define MM_IS_MODEM_3GPP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_3GPP))
+#define MM_IS_MODEM_3GPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MODEM_3GPP))
+#define MM_MODEM_3GPP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_3GPP, MMModem3gppClass))
+
+typedef struct _MMModem3gpp MMModem3gpp;
+typedef struct _MMModem3gppClass MMModem3gppClass;
 
-typedef MmGdbusModem3gpp      MMModem3gpp;
-#define MM_TYPE_MODEM_3GPP(o) MM_GDBUS_TYPE_MODEM3GPP (o)
-#define MM_MODEM_3GPP(o)      MM_GDBUS_MODEM3GPP(o)
-#define MM_IS_MODEM_3GPP(o)   MM_GDBUS_IS_MODEM3GPP(o)
+/**
+ * MMModem3gpp:
+ *
+ * The #MMModem3gpp structure contains private data and should only be accessed
+ * using the provided API.
+ */
+struct _MMModem3gpp {
+    /*< private >*/
+    MmGdbusModem3gppProxy parent;
+    gpointer unused;
+};
+
+struct _MMModem3gppClass {
+    /*< private >*/
+    MmGdbusModem3gppProxyClass parent;
+};
+
+GType mm_modem_3gpp_get_type (void);
 
 const gchar *mm_modem_3gpp_get_path (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_path (MMModem3gpp *self);
 
 const gchar *mm_modem_3gpp_get_imei          (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_imei          (MMModem3gpp *self);
+
 const gchar *mm_modem_3gpp_get_operator_code (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_operator_code (MMModem3gpp *self);
+
 const gchar *mm_modem_3gpp_get_operator_name (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_operator_name (MMModem3gpp *self);
+
 MMModem3gppRegistrationState  mm_modem_3gpp_get_registration_state     (MMModem3gpp *self);
+
 MMModem3gppFacility           mm_modem_3gpp_get_enabled_facility_locks (MMModem3gpp *self);
 
 
@@ -61,6 +88,14 @@ gboolean mm_modem_3gpp_register_sync   (MMModem3gpp *self,
                                         GCancellable *cancellable,
                                         GError **error);
 
+/**
+ * MMModem3gppNetwork:
+ *
+ * The #MMModem3gppNetwork structure contains private data and should only be accessed
+ * using the provided API.
+ */
+typedef struct _MMModem3gppNetwork MMModem3gppNetwork;
+
 MMModem3gppNetworkAvailability  mm_modem_3gpp_network_get_availability      (const MMModem3gppNetwork *network);
 const gchar                    *mm_modem_3gpp_network_get_operator_long     (const MMModem3gppNetwork *network);
 const gchar                    *mm_modem_3gpp_network_get_operator_short    (const MMModem3gppNetwork *network);