libmm-glib,time: `MMModemTime' is now a real object

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

1 files changed, 32 insertions, 5 deletions

diff --git a/libmm-glib/mm-modem-time.h b/libmm-glib/mm-modem-time.h
index 99afec7e..8718f014 100644
--- a/libmm-glib/mm-modem-time.h
+++ b/libmm-glib/mm-modem-time.h
@@ -17,6 +17,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
  * Copyright (C) 2012 Google, Inc.
  */
 
@@ -28,10 +29,35 @@
 
 G_BEGIN_DECLS
 
-typedef MmGdbusModemTime      MMModemTime;
-#define MM_TYPE_MODEM_TIME(o) MM_GDBUS_TYPE_MODEM_TIME (o)
-#define MM_MODEM_TIME(o)      MM_GDBUS_MODEM_TIME(o)
-#define MM_IS_MODEM_TIME(o)   MM_GDBUS_IS_MODEM_TIME(o)
+#define MM_TYPE_MODEM_TIME            (mm_modem_time_get_type ())
+#define MM_MODEM_TIME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_TIME, MMModemTime))
+#define MM_MODEM_TIME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_TIME, MMModemTimeClass))
+#define MM_IS_MODEM_TIME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_TIME))
+#define MM_IS_MODEM_TIME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MODEM_TIME))
+#define MM_MODEM_TIME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_TIME, MMModemTimeClass))
+
+typedef struct _MMModemTime MMModemTime;
+typedef struct _MMModemTimeClass MMModemTimeClass;
+typedef struct _MMModemTimePrivate MMModemTimePrivate;
+
+/**
+ * MMModemTime:
+ *
+ * The #MMModemTime structure contains private data and should only be accessed
+ * using the provided API.
+ */
+struct _MMModemTime {
+    /*< private >*/
+    MmGdbusModemTimeProxy parent;
+    MMModemTimePrivate *priv;
+};
+
+struct _MMModemTimeClass {
+    /*< private >*/
+    MmGdbusModemTimeProxyClass parent;
+};
+
+GType mm_modem_time_get_type (void);
 
 const gchar *mm_modem_time_get_path (MMModemTime *self);
 gchar       *mm_modem_time_dup_path (MMModemTime *self);
@@ -47,7 +73,8 @@ gchar *mm_modem_time_get_network_time_sync   (MMModemTime *self,
                                               GCancellable *cancellable,
                                               GError **error);
 
-MMNetworkTimezone *mm_modem_time_get_network_timezone (MMModemTime *self);
+MMNetworkTimezone *mm_modem_time_peek_network_timezone (MMModemTime *self);
+MMNetworkTimezone *mm_modem_time_get_network_timezone  (MMModemTime *self);
 
 G_END_DECLS