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

[Simon McVittie]

20080722182307-53eee-d8aa42518893ec274ed431e4bc442fe9919d4a57.gz
---
 src/roster.c |    3 +--
 src/roster.h |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/roster.c b/src/roster.c
index 904b91b..0d35db3 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -58,7 +58,6 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-typedef struct _GabbleRosterPrivate GabbleRosterPrivate;
 struct _GabbleRosterPrivate
 {
   GabbleConnection *conn;
@@ -129,7 +128,7 @@ G_DEFINE_TYPE_WITH_CODE (GabbleRoster, gabble_roster, G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_FACTORY_IFACE,
       gabble_roster_factory_iface_init));
 
-#define GABBLE_ROSTER_GET_PRIVATE(o) ((GabbleRosterPrivate *) ((o)->priv))
+#define GABBLE_ROSTER_GET_PRIVATE(o) ((o)->priv)
 
 static void
 gabble_roster_class_init (GabbleRosterClass *gabble_roster_class)
diff --git a/src/roster.h b/src/roster.h
index bba81c3..ee6991f 100644
--- a/src/roster.h
+++ b/src/roster.h
@@ -28,6 +28,7 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GabbleRosterPrivate GabbleRosterPrivate;
 typedef struct _GabbleRosterClass GabbleRosterClass;
 
 GType gabble_roster_get_type (void);
@@ -52,7 +53,7 @@ struct _GabbleRosterClass {
 
 struct _GabbleRoster {
     GObject parent;
-    gpointer priv;
+    GabbleRosterPrivate *priv;
 };
 
 typedef enum
-- 
1.5.6.3