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

[Simon McVittie]

20080722182027-53eee-e5e00aeb768f1598d943cd424ba5a97a8acdb117.gz
---
 src/bytestream-muc.c |    4 +---
 src/bytestream-muc.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c
index 822aeba..36af186 100644
--- a/src/bytestream-muc.c
+++ b/src/bytestream-muc.c
@@ -74,7 +74,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleBytestreamMucPrivate GabbleBytestreamMucPrivate;
 struct _GabbleBytestreamMucPrivate
 {
   GabbleConnection *conn;
@@ -89,8 +88,7 @@ struct _GabbleBytestreamMucPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_BYTESTREAM_MUC_GET_PRIVATE(obj) \
-    ((GabbleBytestreamMucPrivate *) obj->priv)
+#define GABBLE_BYTESTREAM_MUC_GET_PRIVATE(obj) ((obj)->priv)
 
 static void
 free_buffer (GString *buffer)
diff --git a/src/bytestream-muc.h b/src/bytestream-muc.h
index ff736e5..8b88220 100644
--- a/src/bytestream-muc.h
+++ b/src/bytestream-muc.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 typedef struct _GabbleBytestreamMuc GabbleBytestreamMuc;
 typedef struct _GabbleBytestreamMucClass GabbleBytestreamMucClass;
+typedef struct _GabbleBytestreamMucPrivate GabbleBytestreamMucPrivate;
 
 struct _GabbleBytestreamMucClass {
   GObjectClass parent_class;
@@ -37,7 +38,7 @@ struct _GabbleBytestreamMucClass {
 struct _GabbleBytestreamMuc {
   GObject parent;
 
-  gpointer priv;
+  GabbleBytestreamMucPrivate *priv;
 };
 
 GType gabble_bytestream_muc_get_type (void);
-- 
1.5.6.3