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

[Simon McVittie]

20080722182327-53eee-236cece54edb3bd27fcf6acd4b05a95c109268a6.gz
---
 src/tube-stream.c |    4 +---
 src/tube-stream.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index 4d60b8d..852130a 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -94,7 +94,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleTubeStreamPrivate GabbleTubeStreamPrivate;
 struct _GabbleTubeStreamPrivate
 {
   GabbleConnection *conn;
@@ -121,8 +120,7 @@ struct _GabbleTubeStreamPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_TUBE_STREAM_GET_PRIVATE(obj) \
-    ((GabbleTubeStreamPrivate *) obj->priv)
+#define GABBLE_TUBE_STREAM_GET_PRIVATE(obj) ((obj)->priv)
 
 static void data_received_cb (GabbleBytestreamIface *ibb, TpHandle sender,
     GString *data, gpointer user_data);
diff --git a/src/tube-stream.h b/src/tube-stream.h
index f73b4b6..cc953d0 100644
--- a/src/tube-stream.h
+++ b/src/tube-stream.h
@@ -29,6 +29,7 @@
 G_BEGIN_DECLS
 
 typedef struct _GabbleTubeStream GabbleTubeStream;
+typedef struct _GabbleTubeStreamPrivate GabbleTubeStreamPrivate;
 typedef struct _GabbleTubeStreamClass GabbleTubeStreamClass;
 
 struct _GabbleTubeStreamClass {
@@ -38,7 +39,7 @@ struct _GabbleTubeStreamClass {
 struct _GabbleTubeStream {
   GObject parent;
 
-  gpointer priv;
+  GabbleTubeStreamPrivate *priv;
 };
 
 GType gabble_tube_stream_get_type (void);
-- 
1.5.6.3