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

[Simon McVittie]

20080722182012-53eee-423530bc257586ba51e59eae7cb4b4c210a7f7df.gz
---
 src/bytestream-ibb.c |    4 +---
 src/bytestream-ibb.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index 50e9f8f..e140d2f 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -73,7 +73,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleBytestreamIBBPrivate GabbleBytestreamIBBPrivate;
 struct _GabbleBytestreamIBBPrivate
 {
   GabbleConnection *conn;
@@ -90,8 +89,7 @@ struct _GabbleBytestreamIBBPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_BYTESTREAM_IBB_GET_PRIVATE(obj) \
-    ((GabbleBytestreamIBBPrivate *) obj->priv)
+#define GABBLE_BYTESTREAM_IBB_GET_PRIVATE(obj) ((obj)->priv)
 
 static void
 gabble_bytestream_ibb_init (GabbleBytestreamIBB *self)
diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h
index 02716d7..f4d9b2a 100644
--- a/src/bytestream-ibb.h
+++ b/src/bytestream-ibb.h
@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 
 typedef struct _GabbleBytestreamIBB GabbleBytestreamIBB;
 typedef struct _GabbleBytestreamIBBClass GabbleBytestreamIBBClass;
+typedef struct _GabbleBytestreamIBBPrivate GabbleBytestreamIBBPrivate;
 
 struct _GabbleBytestreamIBBClass {
   GObjectClass parent_class;
@@ -39,7 +40,7 @@ struct _GabbleBytestreamIBBClass {
 struct _GabbleBytestreamIBB {
   GObject parent;
 
-  gpointer priv;
+  GabbleBytestreamIBBPrivate *priv;
 };
 
 GType gabble_bytestream_ibb_get_type (void);
-- 
1.5.6.3