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

[Simon McVittie]

20080722182125-53eee-41fdc9bb10193b54cd8887dda36fc357df3343f8.gz
---
 src/media-session.c |    4 +---
 src/media-session.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/media-session.c b/src/media-session.c
index 746ad8c..7ec010b 100644
--- a/src/media-session.c
+++ b/src/media-session.c
@@ -85,7 +85,6 @@ enum
 };
 
 /* private structure */
-typedef struct _GabbleMediaSessionPrivate GabbleMediaSessionPrivate;
 
 struct _GabbleMediaSessionPrivate
 {
@@ -111,8 +110,7 @@ struct _GabbleMediaSessionPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_MEDIA_SESSION_GET_PRIVATE(obj) \
-    ((GabbleMediaSessionPrivate *) obj->priv)
+#define GABBLE_MEDIA_SESSION_GET_PRIVATE(obj) ((obj)->priv)
 
 typedef struct {
     gchar *name;
diff --git a/src/media-session.h b/src/media-session.h
index 5ce24dd..a7765f0 100644
--- a/src/media-session.h
+++ b/src/media-session.h
@@ -56,6 +56,7 @@ typedef enum {
 
 typedef struct _GabbleMediaSession GabbleMediaSession;
 typedef struct _GabbleMediaSessionClass GabbleMediaSessionClass;
+typedef struct _GabbleMediaSessionPrivate GabbleMediaSessionPrivate;
 
 struct _GabbleMediaSessionClass {
     GObjectClass parent_class;
@@ -66,7 +67,7 @@ struct _GabbleMediaSession {
 
     JingleInitiator initiator;
 
-    gpointer priv;
+    GabbleMediaSessionPrivate *priv;
 };
 
 GType gabble_media_session_get_type (void);
-- 
1.5.6.3