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

[Simon McVittie]

20080722182337-53eee-9b41bb10f10f87ed548b3e457d9da46de8188bae.gz
---
 src/tubes-channel.c |    4 +---
 src/tubes-channel.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index dfc6645..dffd60c 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -90,7 +90,6 @@ enum
 };
 
 /* private structure */
-typedef struct _GabbleTubesChannelPrivate GabbleTubesChannelPrivate;
 
 struct _GabbleTubesChannelPrivate
 {
@@ -107,8 +106,7 @@ struct _GabbleTubesChannelPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_TUBES_CHANNEL_GET_PRIVATE(obj) \
-    ((GabbleTubesChannelPrivate *) obj->priv)
+#define GABBLE_TUBES_CHANNEL_GET_PRIVATE(obj) ((obj)->priv)
 
 static gboolean update_tubes_presence (GabbleTubesChannel *self);
 
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index 0151cfc..2024671 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -31,6 +31,7 @@
 G_BEGIN_DECLS
 
 typedef struct _GabbleTubesChannel GabbleTubesChannel;
+typedef struct _GabbleTubesChannelPrivate GabbleTubesChannelPrivate;
 typedef struct _GabbleTubesChannelClass GabbleTubesChannelClass;
 
 struct _GabbleTubesChannelClass {
@@ -44,7 +45,7 @@ struct _GabbleTubesChannel {
 
     GabbleMucChannel *muc;
 
-    gpointer priv;
+    GabbleTubesChannelPrivate *priv;
 };
 
 GType gabble_tubes_channel_get_type (void);
-- 
1.5.6.3