[Telepathy-commits] [telepathy-glib/master] TpPresenceMixin: allow things with the mixin to be subclassed

[Simon McVittie]

---
 telepathy-glib/presence-mixin.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h
index 37ad7de..93ad88b 100644
--- a/telepathy-glib/presence-mixin.h
+++ b/telepathy-glib/presence-mixin.h
@@ -225,16 +225,14 @@ struct _TpPresenceMixin {
 #define TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK \
   (tp_presence_mixin_class_get_offset_quark ())
 #define TP_PRESENCE_MIXIN_CLASS_OFFSET(o) \
-  (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_CLASS_TYPE (o), \
-                                       TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK)))
+  tp_mixin_class_get_offset (o, TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK)
 #define TP_PRESENCE_MIXIN_CLASS(o) \
   ((TpPresenceMixinClass *) tp_mixin_offset_cast (o, \
     TP_PRESENCE_MIXIN_CLASS_OFFSET (o)))
 
 #define TP_PRESENCE_MIXIN_OFFSET_QUARK (tp_presence_mixin_get_offset_quark ())
 #define TP_PRESENCE_MIXIN_OFFSET(o) \
-  (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_TYPE (o), \
-                                       TP_PRESENCE_MIXIN_OFFSET_QUARK)))
+  tp_mixin_instance_get_offset (o, TP_PRESENCE_MIXIN_OFFSET_QUARK)
 #define TP_PRESENCE_MIXIN(o) \
   ((TpPresenceMixin *) tp_mixin_offset_cast (o, TP_PRESENCE_MIXIN_OFFSET (o)))
 
-- 
1.5.6.5