libmm-glib,sim: `MMSim' is now a real object

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

1 files changed, 39 insertions, 11 deletions

diff --git a/libmm-glib/mm-sim.h b/libmm-glib/mm-sim.h
index 73014349e..43b5d971a 100644
--- a/libmm-glib/mm-sim.h
+++ b/libmm-glib/mm-sim.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_SIM_H_
@@ -28,22 +29,49 @@
 
 G_BEGIN_DECLS
 
-typedef MmGdbusSim     MMSim;
-#define MM_TYPE_SIM(o) MM_GDBUS_TYPE_SIM (o)
-#define MM_SIM(o)      MM_GDBUS_SIM(o)
-#define MM_IS_SIM(o)   MM_GDBUS_IS_SIM(o)
+#define MM_TYPE_SIM            (mm_sim_get_type ())
+#define MM_SIM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM, MMSim))
+#define MM_SIM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_SIM, MMSimClass))
+#define MM_IS_SIM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SIM))
+#define MM_IS_SIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_SIM))
+#define MM_SIM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_SIM, MMSimClass))
+
+typedef struct _MMSim MMSim;
+typedef struct _MMSimClass MMSimClass;
+
+/**
+ * MMSim:
+ *
+ * The #MMSim structure contains private data and should only be accessed
+ * using the provided API.
+ */
+struct _MMSim {
+    /*< private >*/
+    MmGdbusSimProxy parent;
+    gpointer unused;
+};
+
+struct _MMSimClass {
+    /*< private >*/
+    MmGdbusSimProxyClass parent;
+};
+
+GType mm_sim_get_type (void);
 
 const gchar *mm_sim_get_path                (MMSim *self);
+gchar       *mm_sim_dup_path                (MMSim *self);
+
 const gchar *mm_sim_get_identifier          (MMSim *self);
+gchar       *mm_sim_dup_identifier          (MMSim *self);
+
 const gchar *mm_sim_get_imsi                (MMSim *self);
+gchar       *mm_sim_dup_imsi                (MMSim *self);
+
 const gchar *mm_sim_get_operator_identifier (MMSim *self);
-const gchar *mm_sim_get_operator_name       (MMSim *self);
+gchar       *mm_sim_dup_operator_identifier (MMSim *self);
 
-gchar *mm_sim_dup_path                (MMSim *self);
-gchar *mm_sim_dup_identifier          (MMSim *self);
-gchar *mm_sim_dup_imsi                (MMSim *self);
-gchar *mm_sim_dup_operator_identifier (MMSim *self);
-gchar *mm_sim_dup_operator_name       (MMSim *self);
+const gchar *mm_sim_get_operator_name       (MMSim *self);
+gchar       *mm_sim_dup_operator_name       (MMSim *self);
 
 void     mm_sim_send_pin        (MMSim *self,
                                  const gchar *pin,