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

[Simon McVittie]

20080722182255-53eee-dcb1ab95c7bbfbf9a826606423ae980f932b767a.gz
---
 src/roster-channel.c |    4 +---
 src/roster-channel.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/roster-channel.c b/src/roster-channel.c
index 3693b48..dafb63f 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -67,7 +67,6 @@ enum
 };
 
 /* private structure */
-typedef struct _GabbleRosterChannelPrivate GabbleRosterChannelPrivate;
 
 struct _GabbleRosterChannelPrivate
 {
@@ -80,8 +79,7 @@ struct _GabbleRosterChannelPrivate
   gboolean closed;
 };
 
-#define GABBLE_ROSTER_CHANNEL_GET_PRIVATE(obj) \
-    ((GabbleRosterChannelPrivate *) obj->priv)
+#define GABBLE_ROSTER_CHANNEL_GET_PRIVATE(obj) ((obj)->priv)
 
 static void
 gabble_roster_channel_init (GabbleRosterChannel *self)
diff --git a/src/roster-channel.h b/src/roster-channel.h
index 896454f..bf25478 100644
--- a/src/roster-channel.h
+++ b/src/roster-channel.h
@@ -30,6 +30,7 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GabbleRosterChannelPrivate GabbleRosterChannelPrivate;
 typedef struct _GabbleRosterChannelClass GabbleRosterChannelClass;
 
 struct _GabbleRosterChannelClass {
@@ -44,7 +45,7 @@ struct _GabbleRosterChannel {
 
     TpGroupMixin group;
 
-    gpointer priv;
+    GabbleRosterChannelPrivate *priv;
 };
 
 GType gabble_roster_channel_get_type (void);
-- 
1.5.6.3