[Telepathy-commits] [telepathy-gabble/master] GabbleDisco: simplify priv access

[Simon McVittie]

20080722182104-53eee-a73f8eee6790136d42a99b19f76224b878aec7fd.gz
---
 src/disco.c |    3 +--
 src/disco.h |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/disco.c b/src/disco.c
index 2f0549c..d6b8bb0 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -52,7 +52,6 @@ enum
 
 G_DEFINE_TYPE(GabbleDisco, gabble_disco, G_TYPE_OBJECT);
 
-typedef struct _GabbleDiscoPrivate GabbleDiscoPrivate;
 struct _GabbleDiscoPrivate
 {
   GabbleConnection *connection;
@@ -83,7 +82,7 @@ gabble_disco_error_quark (void)
   return quark;
 }
 
-#define GABBLE_DISCO_GET_PRIVATE(o) ((GabbleDiscoPrivate *) ((o)->priv))
+#define GABBLE_DISCO_GET_PRIVATE(o) ((o)->priv)
 
 static void
 gabble_disco_init (GabbleDisco *obj)
diff --git a/src/disco.h b/src/disco.h
index 5951645..cf937d1 100644
--- a/src/disco.h
+++ b/src/disco.h
@@ -38,6 +38,7 @@ typedef enum
 } GabbleDiscoType;
 
 typedef struct _GabbleDiscoClass GabbleDiscoClass;
+typedef struct _GabbleDiscoPrivate GabbleDiscoPrivate;
 typedef struct _GabbleDiscoRequest GabbleDiscoRequest;
 
 /**
@@ -78,7 +79,7 @@ struct _GabbleDiscoClass {
 
 struct _GabbleDisco {
     GObject parent;
-    gpointer priv;
+    GabbleDiscoPrivate *priv;
 };
 
 typedef void (*GabbleDiscoCb)(GabbleDisco *self, GabbleDiscoRequest *request,
-- 
1.5.6.3