[Telepathy-commits] [telepathy-gabble/master] taking advantage of static typechecks for Jingle*Private

[Senko Rasic]

---
 src/jingle-content.c          |    4 +---
 src/jingle-content.h          |    4 +++-
 src/jingle-factory.c          |    4 +---
 src/jingle-factory.h          |    4 +++-
 src/jingle-media-rtp.c        |    4 +---
 src/jingle-media-rtp.h        |    4 +++-
 src/jingle-session.c          |    4 +---
 src/jingle-session.h          |    4 +++-
 src/jingle-transport-google.c |    4 +---
 src/jingle-transport-google.h |    4 +++-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index fd826c9..1599ec0 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -62,7 +62,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleJingleContentPrivate GabbleJingleContentPrivate;
 struct _GabbleJingleContentPrivate
 {
   gchar *name;
@@ -85,8 +84,7 @@ struct _GabbleJingleContentPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_CONTENT_GET_PRIVATE(o)\
-  ((GabbleJingleContentPrivate *) ((o)->priv))
+#define GABBLE_JINGLE_CONTENT_GET_PRIVATE(o) ((o)->priv)
 
 /* lookup tables */
 
diff --git a/src/jingle-content.h b/src/jingle-content.h
index b8731a0..225e259 100644
--- a/src/jingle-content.h
+++ b/src/jingle-content.h
@@ -83,9 +83,11 @@ struct _GabbleJingleContentClass {
     void  (*produce_description) (GabbleJingleContent *, LmMessageNode *);
 };
 
+typedef struct _GabbleJingleContentPrivate GabbleJingleContentPrivate;
+
 struct _GabbleJingleContent {
     GObject parent;
-    gpointer priv;
+    GabbleJingleContentPrivate *priv;
 
     GabbleConnection *conn;
     GabbleJingleFactory *factory;
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index d28c392..589c8c5 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -58,7 +58,6 @@ enum
 };
 
 
-typedef struct _GabbleJingleFactoryPrivate GabbleJingleFactoryPrivate;
 struct _GabbleJingleFactoryPrivate
 {
   GabbleConnection *conn;
@@ -69,8 +68,7 @@ struct _GabbleJingleFactoryPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_FACTORY_GET_PRIVATE(o)\
-  ((GabbleJingleFactoryPrivate *) ((o)->priv))
+#define GABBLE_JINGLE_FACTORY_GET_PRIVATE(o) ((o)->priv)
 
 static LmHandlerResult jingle_cb (LmMessageHandler *handler,
     LmConnection *lmconn, LmMessage *message, gpointer user_data);
diff --git a/src/jingle-factory.h b/src/jingle-factory.h
index df84f54..3e2733d 100644
--- a/src/jingle-factory.h
+++ b/src/jingle-factory.h
@@ -116,6 +116,8 @@ struct _GabbleJingleFactoryClass {
     GObjectClass parent_class;
 };
 
+typedef struct _GabbleJingleFactoryPrivate GabbleJingleFactoryPrivate;
+
 struct _GabbleJingleFactory {
     GObject parent;
 
@@ -127,7 +129,7 @@ struct _GabbleJingleFactory {
     guint16 stun_port;
     gchar *relay_token;
 
-    gpointer priv;
+    GabbleJingleFactoryPrivate *priv;
 };
 
 void gabble_jingle_factory_register_content_type (GabbleJingleFactory *factory,
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 86d9829..fe4bd45 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -71,7 +71,6 @@ typedef struct {
   guint channels;
 } JingleCodec;
 
-typedef struct _GabbleJingleMediaRtpPrivate GabbleJingleMediaRtpPrivate;
 struct _GabbleJingleMediaRtpPrivate
 {
   GList *local_codecs;
@@ -80,8 +79,7 @@ struct _GabbleJingleMediaRtpPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_MEDIA_RTP_GET_PRIVATE(o)\
-  ((GabbleJingleMediaRtpPrivate *) ((o)->priv))
+#define GABBLE_JINGLE_MEDIA_RTP_GET_PRIVATE(o) ((o)->priv)
 
 static void
 gabble_jingle_media_rtp_init (GabbleJingleMediaRtp *obj)
diff --git a/src/jingle-media-rtp.h b/src/jingle-media-rtp.h
index 1b7b2d5..4a9dc5a 100644
--- a/src/jingle-media-rtp.h
+++ b/src/jingle-media-rtp.h
@@ -53,9 +53,11 @@ struct _GabbleJingleMediaRtpClass {
     GabbleJingleContentClass parent_class;
 };
 
+typedef struct _GabbleJingleMediaRtpPrivate GabbleJingleMediaRtpPrivate;
+
 struct _GabbleJingleMediaRtp {
     GabbleJingleContent parent;
-    gpointer priv;
+    GabbleJingleMediaRtpPrivate *priv;
 };
 
 const gchar *gabble_jingle_media_rtp_parse (GabbleJingleMediaRtp *sess,
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 99bc2ea..2615bf9 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -60,7 +60,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleJingleSessionPrivate GabbleJingleSessionPrivate;
 struct _GabbleJingleSessionPrivate
 {
   GabbleConnection *conn;
@@ -85,8 +84,7 @@ struct _GabbleJingleSessionPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_SESSION_GET_PRIVATE(o)\
-  ((GabbleJingleSessionPrivate *) ((o)->priv))
+#define GABBLE_JINGLE_SESSION_GET_PRIVATE(o) ((o)->priv)
 
 #define DEFAULT_SESSION_TIMEOUT 60000
 
diff --git a/src/jingle-session.h b/src/jingle-session.h
index bee1e37..991db7f 100644
--- a/src/jingle-session.h
+++ b/src/jingle-session.h
@@ -70,9 +70,11 @@ struct _GabbleJingleSessionClass {
     GObjectClass parent_class;
 };
 
+typedef struct _GabbleJingleSessionPrivate GabbleJingleSessionPrivate;
+
 struct _GabbleJingleSession {
     GObject parent;
-    gpointer priv;
+    GabbleJingleSessionPrivate *priv;
 
     TpHandle peer;
 };
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index c58aeed..22ca6e4 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -63,7 +63,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleJingleTransportGooglePrivate GabbleJingleTransportGooglePrivate;
 struct _GabbleJingleTransportGooglePrivate
 {
   GabbleJingleContent *content;
@@ -81,8 +80,7 @@ struct _GabbleJingleTransportGooglePrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE(o)\
-  ((GabbleJingleTransportGooglePrivate *) ((o)->priv))
+#define GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE(o) ((o)->priv)
 
 static void transmit_candidates (GabbleJingleTransportGoogle *transport,
     GList *candidates);
diff --git a/src/jingle-transport-google.h b/src/jingle-transport-google.h
index f03d3da..204a504 100644
--- a/src/jingle-transport-google.h
+++ b/src/jingle-transport-google.h
@@ -51,9 +51,11 @@ struct _GabbleJingleTransportGoogleClass {
     GObjectClass parent_class;
 };
 
+typedef struct _GabbleJingleTransportGooglePrivate GabbleJingleTransportGooglePrivate;
+
 struct _GabbleJingleTransportGoogle {
     GObject parent;
-    gpointer priv;
+    GabbleJingleTransportGooglePrivate *priv;
 };
 
 void jingle_transport_google_register (GabbleJingleFactory *factory);
-- 
1.5.6.5