[Telepathy-commits] [telepathy-glib/master] TpGroupMixin: allow things with the mixin to be subclassed (fd.o #15092)

[Simon McVittie]

---
 telepathy-glib/group-mixin.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h
index eda9542..0ed90b5 100644
--- a/telepathy-glib/group-mixin.h
+++ b/telepathy-glib/group-mixin.h
@@ -148,15 +148,14 @@ struct _TpGroupMixin {
 #define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \
   (tp_group_mixin_class_get_offset_quark ())
 #define TP_GROUP_MIXIN_CLASS_OFFSET(o) \
-  (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_CLASS_TYPE (o), \
-                                       TP_GROUP_MIXIN_CLASS_OFFSET_QUARK)))
+  tp_mixin_class_get_offset (o, TP_GROUP_MIXIN_CLASS_OFFSET_QUARK)
 #define TP_GROUP_MIXIN_CLASS(o) \
   ((TpGroupMixinClass *) tp_mixin_offset_cast (o, \
     TP_GROUP_MIXIN_CLASS_OFFSET (o)))
 
 #define TP_GROUP_MIXIN_OFFSET_QUARK (tp_group_mixin_get_offset_quark ())
-#define TP_GROUP_MIXIN_OFFSET(o) (GPOINTER_TO_UINT (g_type_get_qdata (\
-        G_OBJECT_TYPE (o), TP_GROUP_MIXIN_OFFSET_QUARK)))
+#define TP_GROUP_MIXIN_OFFSET(o) \
+  tp_mixin_instance_get_offset (o, TP_GROUP_MIXIN_OFFSET_QUARK)
 #define TP_GROUP_MIXIN(o) ((TpGroupMixin *) tp_mixin_offset_cast (o, \
       TP_GROUP_MIXIN_OFFSET(o)))
 
-- 
1.5.6.5