[Telepathy-commits] [telepathy-salut/master] use new style GET_PRIV

[Guillaume Desmottes]

---
 src/salut-muc-manager.c |   10 +++++++---
 src/salut-muc-manager.h |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/salut-muc-manager.c b/src/salut-muc-manager.c
index 6d9c1fc..aa2fbac 100644
--- a/src/salut-muc-manager.c
+++ b/src/salut-muc-manager.c
@@ -95,12 +95,17 @@ struct _SalutMucManagerPrivate
   gboolean dispose_has_run;
 };
 
-#define SALUT_MUC_MANAGER_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), SALUT_TYPE_MUC_MANAGER, SalutMucManagerPrivate))
+#define SALUT_MUC_MANAGER_GET_PRIVATE(obj) \
+  ((SalutMucManagerPrivate *) ((SalutMucManager *)obj)->priv)
 
 static void
 salut_muc_manager_init (SalutMucManager *obj)
 {
-  SalutMucManagerPrivate *priv = SALUT_MUC_MANAGER_GET_PRIVATE (obj);
+  SalutMucManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
+      SALUT_TYPE_MUC_MANAGER, SalutMucManagerPrivate);
+
+  obj->priv = priv;
+
   priv->connection = NULL;
 
   /* allocate any data required by the object here */
@@ -1113,4 +1118,3 @@ salut_muc_manager_ensure_tubes_channel (SalutMucManager *self,
 
   return tubes_chan;
 }
-
diff --git a/src/salut-muc-manager.h b/src/salut-muc-manager.h
index 3b3e07a..2c50066 100644
--- a/src/salut-muc-manager.h
+++ b/src/salut-muc-manager.h
@@ -47,6 +47,8 @@ struct _SalutMucManagerClass {
 
 struct _SalutMucManager {
     GObject parent;
+
+    gpointer priv;
 };
 
 GType salut_muc_manager_get_type (void);
-- 
1.5.6.5