[telepathy-gabble/master] Remove GET_PRIV macros from {Ice,Raw}Udp

[Will Thompson]

---
 src/jingle-transport-iceudp.c |   18 ++++++------------
 src/jingle-transport-rawudp.c |   18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/jingle-transport-iceudp.c b/src/jingle-transport-iceudp.c
index 49b8129..d51771a 100644
--- a/src/jingle-transport-iceudp.c
+++ b/src/jingle-transport-iceudp.c
@@ -86,8 +86,6 @@ struct _GabbleJingleTransportIceUdpPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE(o) ((o)->priv)
-
 static void
 gabble_jingle_transport_iceudp_init (GabbleJingleTransportIceUdp *obj)
 {
@@ -104,7 +102,7 @@ static void
 gabble_jingle_transport_iceudp_dispose (GObject *object)
 {
   GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv = GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -132,7 +130,7 @@ gabble_jingle_transport_iceudp_get_property (GObject *object,
                                              GParamSpec *pspec)
 {
   GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv = GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -157,8 +155,7 @@ gabble_jingle_transport_iceudp_set_property (GObject *object,
                                              GParamSpec *pspec)
 {
   GabbleJingleTransportIceUdp *trans = GABBLE_JINGLE_TRANSPORT_ICEUDP (object);
-  GabbleJingleTransportIceUdpPrivate *priv =
-      GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportIceUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -240,8 +237,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
     LmMessageNode *transport_node, GError **error)
 {
   GabbleJingleTransportIceUdp *t = GABBLE_JINGLE_TRANSPORT_ICEUDP (obj);
-  GabbleJingleTransportIceUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (t);
+  GabbleJingleTransportIceUdpPrivate *priv = t->priv;
   GList *candidates = NULL;
   LmMessageNode *node;
 
@@ -468,8 +464,7 @@ new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
 {
   GabbleJingleTransportIceUdp *transport =
     GABBLE_JINGLE_TRANSPORT_ICEUDP (obj);
-  GabbleJingleTransportIceUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (transport);
+  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
   JingleContentState state;
 
   g_object_get (priv->content, "state", &state, NULL);
@@ -489,8 +484,7 @@ get_remote_candidates (GabbleJingleTransportIface *iface)
 {
   GabbleJingleTransportIceUdp *transport =
     GABBLE_JINGLE_TRANSPORT_ICEUDP (iface);
-  GabbleJingleTransportIceUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_ICEUDP_GET_PRIVATE (transport);
+  GabbleJingleTransportIceUdpPrivate *priv = transport->priv;
 
   return priv->remote_candidates;
 }
diff --git a/src/jingle-transport-rawudp.c b/src/jingle-transport-rawudp.c
index ac18e4b..d37d56b 100644
--- a/src/jingle-transport-rawudp.c
+++ b/src/jingle-transport-rawudp.c
@@ -80,8 +80,6 @@ struct _GabbleJingleTransportRawUdpPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE(o) ((o)->priv)
-
 static void
 gabble_jingle_transport_rawudp_init (GabbleJingleTransportRawUdp *obj)
 {
@@ -97,7 +95,7 @@ static void
 gabble_jingle_transport_rawudp_dispose (GObject *object)
 {
   GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv = GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -125,7 +123,7 @@ gabble_jingle_transport_rawudp_get_property (GObject *object,
                                              GParamSpec *pspec)
 {
   GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv = GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -150,8 +148,7 @@ gabble_jingle_transport_rawudp_set_property (GObject *object,
                                              GParamSpec *pspec)
 {
   GabbleJingleTransportRawUdp *trans = GABBLE_JINGLE_TRANSPORT_RAWUDP (object);
-  GabbleJingleTransportRawUdpPrivate *priv =
-      GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (trans);
+  GabbleJingleTransportRawUdpPrivate *priv = trans->priv;
 
   switch (property_id) {
     case PROP_CONTENT:
@@ -233,8 +230,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
     LmMessageNode *transport_node, GError **error)
 {
   GabbleJingleTransportRawUdp *t = GABBLE_JINGLE_TRANSPORT_RAWUDP (obj);
-  GabbleJingleTransportRawUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (t);
+  GabbleJingleTransportRawUdpPrivate *priv = t->priv;
   GList *candidates = NULL;
   LmMessageNode *node;
 
@@ -342,8 +338,7 @@ new_local_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
 {
   GabbleJingleTransportRawUdp *transport =
     GABBLE_JINGLE_TRANSPORT_RAWUDP (obj);
-  GabbleJingleTransportRawUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (transport);
+  GabbleJingleTransportRawUdpPrivate *priv = transport->priv;
   JingleContentState state;
 
   if (priv->local_candidates != NULL)
@@ -370,8 +365,7 @@ get_remote_candidates (GabbleJingleTransportIface *iface)
 {
   GabbleJingleTransportRawUdp *transport =
     GABBLE_JINGLE_TRANSPORT_RAWUDP (iface);
-  GabbleJingleTransportRawUdpPrivate *priv =
-    GABBLE_JINGLE_TRANSPORT_RAWUDP_GET_PRIVATE (transport);
+  GabbleJingleTransportRawUdpPrivate *priv = transport->priv;
 
   return priv->remote_candidates;
 }
-- 
1.5.6.5