[Telepathy-commits] [telepathy-gabble/master] Remove redundant GET_PRIV macros from most jingle code
Will Thompson
will.thompson at collabora.co.uk
Fri Mar 13 11:47:51 PDT 2009
MediaFactory still has one because it's not just foo->priv and I was
just doing this while running the test suite.
---
src/jingle-content.c | 40 ++++++++++-----------
src/jingle-factory.c | 31 +++++++----------
src/jingle-session.c | 52 +++++++++++++---------------
src/jingle-transport-google.c | 24 ++++---------
src/media-channel.c | 75 +++++++++++++++++++----------------------
src/media-stream.c | 60 ++++++++++++++++-----------------
6 files changed, 129 insertions(+), 153 deletions(-)
diff --git a/src/jingle-content.c b/src/jingle-content.c
index 7ebfba0..6d56bb2 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -85,8 +85,6 @@ struct _GabbleJingleContentPrivate
gboolean dispose_has_run;
};
-#define GABBLE_JINGLE_CONTENT_GET_PRIVATE(o) ((o)->priv)
-
#define DEFAULT_CONTENT_TIMEOUT 60000
/* lookup tables */
@@ -120,7 +118,7 @@ static void
gabble_jingle_content_dispose (GObject *object)
{
GabbleJingleContent *content = GABBLE_JINGLE_CONTENT (object);
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (content);
+ GabbleJingleContentPrivate *priv = content->priv;
if (priv->dispose_has_run)
return;
@@ -169,7 +167,7 @@ gabble_jingle_content_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleContent *self = GABBLE_JINGLE_CONTENT (object);
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -212,7 +210,7 @@ gabble_jingle_content_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleContent *self = GABBLE_JINGLE_CONTENT (object);
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -451,7 +449,7 @@ static gboolean
send_gtalk4_transport_accept (gpointer user_data)
{
GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (user_data);
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
LmMessageNode *sess_node, *tnode;
LmMessage *msg = gabble_jingle_session_new_message (c->session,
JINGLE_ACTION_TRANSPORT_ACCEPT, &sess_node);
@@ -469,7 +467,7 @@ void
gabble_jingle_content_parse_add (GabbleJingleContent *c,
LmMessageNode *content_node, gboolean google_mode, GError **error)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
const gchar *name, *creator, *senders, *disposition;
LmMessageNode *trans_node, *desc_node;
GType transport_type = 0;
@@ -597,7 +595,7 @@ void
gabble_jingle_content_parse_accept (GabbleJingleContent *c,
LmMessageNode *content_node, gboolean google_mode, GError **error)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
const gchar *senders;
LmMessageNode *trans_node, *desc_node;
JingleDialect dialect;
@@ -669,7 +667,7 @@ void
gabble_jingle_content_produce_node (GabbleJingleContent *c,
LmMessageNode *parent, gboolean full)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
LmMessageNode *content_node, *trans_node;
JingleDialect dialect;
void (*produce_desc)(GabbleJingleContent *, LmMessageNode *) =
@@ -719,7 +717,7 @@ void
gabble_jingle_content_update_senders (GabbleJingleContent *c,
LmMessageNode *content_node, GError **error)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
JingleContentSenders senders;
senders = parse_senders (lm_message_node_get_attribute (content_node, "senders"));
@@ -738,7 +736,7 @@ void
gabble_jingle_content_parse_transport_info (GabbleJingleContent *self,
LmMessageNode *trans_node, GError **error)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
gabble_jingle_transport_iface_parse_candidates (priv->transport, trans_node, error);
}
@@ -747,7 +745,7 @@ gabble_jingle_content_parse_transport_info (GabbleJingleContent *self,
void
gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
gabble_jingle_transport_iface_add_candidates (priv->transport, li);
}
@@ -757,7 +755,7 @@ gabble_jingle_content_add_candidates (GabbleJingleContent *self, GList *li)
gboolean
gabble_jingle_content_is_ready (GabbleJingleContent *self)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
/* If it's created by us, media ready and not signalled,
* it's ready to be added. */
@@ -790,7 +788,7 @@ timeout_content (gpointer data)
static void
send_content_add_or_accept (GabbleJingleContent *self)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
LmMessage *msg;
LmMessageNode *sess_node;
JingleAction action = JINGLE_ACTION_UNKNOWN;
@@ -826,7 +824,7 @@ send_content_add_or_accept (GabbleJingleContent *self)
static void
_maybe_ready (GabbleJingleContent *self)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
JingleSessionState state;
if (!gabble_jingle_content_is_ready (self))
@@ -894,7 +892,7 @@ gabble_jingle_content_retransmit_candidates (GabbleJingleContent *self)
void
_gabble_jingle_content_set_media_ready (GabbleJingleContent *self)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
/* If media was already ready, media info was changed and we need to
* push description-info action to the peer. */
@@ -913,7 +911,7 @@ void
gabble_jingle_content_set_transport_state (GabbleJingleContent *self,
JingleTransportState state)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (self);
+ GabbleJingleContentPrivate *priv = self->priv;
g_object_set (priv->transport, "state", state, NULL);
@@ -927,7 +925,7 @@ gabble_jingle_content_set_transport_state (GabbleJingleContent *self,
GList *
gabble_jingle_content_get_remote_candidates (GabbleJingleContent *c)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
return gabble_jingle_transport_iface_get_remote_candidates (priv->transport);
}
@@ -936,7 +934,7 @@ gboolean
gabble_jingle_content_change_direction (GabbleJingleContent *c,
JingleContentSenders senders)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
LmMessage *msg;
LmMessageNode *sess_node;
JingleDialect dialect;
@@ -965,7 +963,7 @@ _on_remove_reply (GabbleJingleSession *sess, gboolean success,
LmMessage *reply, gpointer user_data)
{
GabbleJingleContent *c = GABBLE_JINGLE_CONTENT (user_data);
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
g_assert (priv->state == JINGLE_CONTENT_STATE_REMOVING);
@@ -977,7 +975,7 @@ _on_remove_reply (GabbleJingleSession *sess, gboolean success,
void
gabble_jingle_content_remove (GabbleJingleContent *c, gboolean signal_peer)
{
- GabbleJingleContentPrivate *priv = GABBLE_JINGLE_CONTENT_GET_PRIVATE (c);
+ GabbleJingleContentPrivate *priv = c->priv;
LmMessage *msg;
LmMessageNode *sess_node;
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 5edf9be..82db3a3 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -84,8 +84,6 @@ struct _GabbleJingleFactoryPrivate
gboolean dispose_has_run;
};
-#define GABBLE_JINGLE_FACTORY_GET_PRIVATE(o) ((o)->priv)
-
static LmHandlerResult jingle_cb (LmMessageHandler *handler,
LmConnection *lmconn, LmMessage *message, gpointer user_data);
static GabbleJingleSession *create_session (GabbleJingleFactory *fac,
@@ -238,7 +236,7 @@ jingle_info_cb (LmMessageHandler *handler,
gpointer user_data)
{
GabbleJingleFactory *fac = GABBLE_JINGLE_FACTORY (user_data);
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (fac);
+ GabbleJingleFactoryPrivate *priv = fac->priv;
LmMessageSubType sub_type;
LmMessageNode *query_node, *node;
@@ -397,7 +395,7 @@ jingle_info_cb (LmMessageHandler *handler,
static void
jingle_info_send_request (GabbleJingleFactory *fac)
{
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (fac);
+ GabbleJingleFactoryPrivate *priv = fac->priv;
TpBaseConnection *base = (TpBaseConnection *) priv->conn;
LmMessage *msg;
LmMessageNode *node;
@@ -427,7 +425,7 @@ static void
gabble_jingle_factory_dispose (GObject *object)
{
GabbleJingleFactory *fac = GABBLE_JINGLE_FACTORY (object);
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (fac);
+ GabbleJingleFactoryPrivate *priv = fac->priv;
if (priv->dispose_has_run)
return;
@@ -466,7 +464,7 @@ gabble_jingle_factory_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleFactory *chan = GABBLE_JINGLE_FACTORY (object);
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (chan);
+ GabbleJingleFactoryPrivate *priv = chan->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -485,7 +483,7 @@ gabble_jingle_factory_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleFactory *chan = GABBLE_JINGLE_FACTORY (object);
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (chan);
+ GabbleJingleFactoryPrivate *priv = chan->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -510,7 +508,7 @@ gabble_jingle_factory_constructor (GType type,
constructor (type, n_props, props);
self = GABBLE_JINGLE_FACTORY (obj);
- priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (self);
+ priv = self->priv;
/* FIXME: why was this in _constructed in media factory? */
g_signal_connect (priv->conn,
@@ -556,7 +554,7 @@ connection_status_changed_cb (GabbleConnection *conn,
guint reason,
GabbleJingleFactory *self)
{
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (self);
+ GabbleJingleFactoryPrivate *priv = self->priv;
switch (status)
{
@@ -640,7 +638,7 @@ connection_status_changed_cb (GabbleConnection *conn,
static gboolean
sid_in_use (GabbleJingleFactory *factory, const gchar *sid)
{
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (factory);
+ GabbleJingleFactoryPrivate *priv = factory->priv;
gpointer key, value;
return g_hash_table_lookup_extended (priv->sessions, sid, &key, &value);
@@ -671,7 +669,7 @@ register_session (GabbleJingleFactory *factory,
const gchar *sid,
GabbleJingleSession *sess)
{
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (factory);
+ GabbleJingleFactoryPrivate *priv = factory->priv;
gchar *sid_copy;
sid_copy = g_strdup (sid);
@@ -683,7 +681,7 @@ void
_jingle_factory_unregister_session (GabbleJingleFactory *factory,
const gchar *sid)
{
- GabbleJingleFactoryPrivate *priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (factory);
+ GabbleJingleFactoryPrivate *priv = factory->priv;
g_hash_table_remove (priv->sessions, sid);
}
@@ -694,8 +692,7 @@ jingle_cb (LmMessageHandler *handler,
gpointer user_data)
{
GabbleJingleFactory *self = GABBLE_JINGLE_FACTORY (user_data);
- GabbleJingleFactoryPrivate *priv =
- GABBLE_JINGLE_FACTORY_GET_PRIVATE (self);
+ GabbleJingleFactoryPrivate *priv = self->priv;
GError *error = NULL;
const gchar *sid;
GabbleJingleSession *sess;
@@ -762,8 +759,7 @@ static GabbleJingleSession *
create_session (GabbleJingleFactory *fac,
const gchar *sid, TpHandle peer, const gchar *peer_resource)
{
- GabbleJingleFactoryPrivate *priv =
- GABBLE_JINGLE_FACTORY_GET_PRIVATE (fac);
+ GabbleJingleFactoryPrivate *priv = fac->priv;
GabbleJingleSession *sess;
gboolean local_initiator;
@@ -1085,8 +1081,7 @@ gabble_jingle_factory_create_google_relay_session (
GabbleJingleFactoryRelaySessionCb callback,
gpointer user_data)
{
- GabbleJingleFactoryPrivate *priv =
- GABBLE_JINGLE_FACTORY_GET_PRIVATE (fac);
+ GabbleJingleFactoryPrivate *priv = fac->priv;
gchar *url;
guint i;
RelaySessionData *rsd;
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 58a0c31..a222a79 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -85,8 +85,6 @@ struct _GabbleJingleSessionPrivate
gboolean dispose_has_run;
};
-#define GABBLE_JINGLE_SESSION_GET_PRIVATE(o) ((o)->priv)
-
#define DEFAULT_SESSION_TIMEOUT 60000
typedef struct {
@@ -147,7 +145,7 @@ static void
gabble_jingle_session_dispose (GObject *object)
{
GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
(TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
@@ -193,7 +191,7 @@ gabble_jingle_session_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -230,7 +228,7 @@ gabble_jingle_session_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -493,7 +491,7 @@ static void
_foreach_content (GabbleJingleSession *sess, LmMessageNode *node,
ContentHandlerFunc func, GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
GabbleJingleContent *c;
LmMessageNode *content_node;
const gchar *name;
@@ -571,7 +569,7 @@ create_content (GabbleJingleSession *sess, GType content_type,
JingleMediaType type, const gchar *content_ns, const gchar *transport_ns,
const gchar *name, LmMessageNode *content_node, GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
GabbleJingleContent *c;
DEBUG ("session creating new content type, conn == %p, jf == %p", priv->conn, priv->conn->jingle_factory);
@@ -622,7 +620,7 @@ static void
_each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
LmMessageNode *content_node, GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
const gchar *name = lm_message_node_get_attribute (content_node, "name");
LmMessageNode *desc_node = lm_message_node_get_child_any_ns (content_node,
"description");
@@ -687,7 +685,7 @@ static void
_each_content_remove (GabbleJingleSession *sess, GabbleJingleContent *c,
LmMessageNode *content_node, GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
const gchar *name = lm_message_node_get_attribute (content_node, "name");
if (c == NULL)
@@ -739,7 +737,7 @@ static void
_each_content_accept (GabbleJingleSession *sess, GabbleJingleContent *c,
LmMessageNode *content_node ,GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
JingleContentState state;
if (c == NULL)
@@ -781,7 +779,7 @@ static void
on_session_initiate (GabbleJingleSession *sess, LmMessageNode *node,
GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
/* we can't call ourselves at the moment */
if (priv->local_initiator)
@@ -831,7 +829,7 @@ static void
on_content_remove (GabbleJingleSession *sess, LmMessageNode *node,
GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
_foreach_content (sess, node, _each_content_remove, error);
@@ -869,7 +867,7 @@ static void
on_session_accept (GabbleJingleSession *sess, LmMessageNode *node,
GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
DEBUG ("called");
@@ -903,7 +901,7 @@ static void
on_transport_info (GabbleJingleSession *sess, LmMessageNode *node,
GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
GabbleJingleContent *c = NULL;
if (JINGLE_IS_GOOGLE_DIALECT (priv->dialect))
@@ -996,7 +994,7 @@ static void
jingle_state_machine_dance (GabbleJingleSession *sess, JingleAction action,
LmMessageNode *node, GError **error)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
/* parser should've checked this already */
g_assert (action_is_allowed (action, priv->state));
@@ -1080,7 +1078,7 @@ gboolean
gabble_jingle_session_parse (GabbleJingleSession *sess, JingleAction action, LmMessage *message, GError **error)
{
TpHandleRepoIface *contact_repo;
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
LmMessageNode *iq_node, *session_node;
const gchar *from, *to, *resource;
const gchar *initiator, *responder;
@@ -1190,7 +1188,7 @@ get_jid_for_contact (GabbleJingleSession *session,
g_assert (GABBLE_IS_JINGLE_SESSION (session));
- priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (session);
+ priv = session->priv;
conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -1219,7 +1217,7 @@ LmMessage *
gabble_jingle_session_new_message (GabbleJingleSession *sess,
JingleAction action, LmMessageNode **sess_node)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
LmMessage *msg;
LmMessageNode *iq_node, *session_node;
gchar *el = NULL, *ns = NULL;
@@ -1382,7 +1380,7 @@ void
gabble_jingle_session_send (GabbleJingleSession *sess, LmMessage *msg,
JingleReplyHandler cb, gpointer user_data)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
if (cb != NULL)
{
@@ -1440,7 +1438,7 @@ timeout_session (gpointer data)
static void
try_session_initiate_or_accept (GabbleJingleSession *sess)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
LmMessage *msg;
LmMessageNode *sess_node;
gboolean contents_ready = TRUE;
@@ -1499,7 +1497,7 @@ try_session_initiate_or_accept (GabbleJingleSession *sess)
static void
set_state (GabbleJingleSession *sess, JingleState state)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
if (state <= priv->state)
{
@@ -1534,7 +1532,7 @@ set_state (GabbleJingleSession *sess, JingleState state)
void
gabble_jingle_session_accept (GabbleJingleSession *sess)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
priv->locally_accepted = TRUE;
@@ -1544,7 +1542,7 @@ gabble_jingle_session_accept (GabbleJingleSession *sess)
void
gabble_jingle_session_terminate (GabbleJingleSession *sess)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
if (priv->state == JS_STATE_ENDED)
{
@@ -1586,7 +1584,7 @@ _foreach_count_active_contents (gpointer key, gpointer value, gpointer user_data
static gboolean
count_active_contents (GabbleJingleSession *sess)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
guint n_contents = 0;
g_hash_table_foreach (priv->contents, _foreach_count_active_contents, &n_contents);
@@ -1597,7 +1595,7 @@ static void
content_removed_cb (GabbleJingleContent *c, gpointer user_data)
{
GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (user_data);
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
const gchar *name;
g_object_get (c, "name", &name, NULL);
@@ -1631,7 +1629,7 @@ GabbleJingleContent *
gabble_jingle_session_add_content (GabbleJingleSession *sess, JingleMediaType mtype,
const gchar *content_ns, const gchar *transport_ns)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
GabbleJingleContent *c;
GType content_type;
gchar *name = NULL;
@@ -1693,7 +1691,7 @@ gabble_jingle_session_get_content_type (GabbleJingleSession *sess)
GList *
gabble_jingle_session_get_contents (GabbleJingleSession *sess)
{
- GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
+ GabbleJingleSessionPrivate *priv = sess->priv;
return g_hash_table_get_values (priv->contents);
}
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index 4e74206..b371c4a 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -80,8 +80,6 @@ struct _GabbleJingleTransportGooglePrivate
gboolean dispose_has_run;
};
-#define GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE(o) ((o)->priv)
-
static void transmit_candidates (GabbleJingleTransportGoogle *transport,
GList *candidates);
@@ -100,7 +98,7 @@ static void
gabble_jingle_transport_google_dispose (GObject *object)
{
GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
- GabbleJingleTransportGooglePrivate *priv = GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (trans);
+ GabbleJingleTransportGooglePrivate *priv = trans->priv;
if (priv->dispose_has_run)
return;
@@ -128,7 +126,7 @@ gabble_jingle_transport_google_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
- GabbleJingleTransportGooglePrivate *priv = GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (trans);
+ GabbleJingleTransportGooglePrivate *priv = trans->priv;
switch (property_id) {
case PROP_CONTENT:
@@ -153,8 +151,7 @@ gabble_jingle_transport_google_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleJingleTransportGoogle *trans = GABBLE_JINGLE_TRANSPORT_GOOGLE (object);
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (trans);
+ GabbleJingleTransportGooglePrivate *priv = trans->priv;
switch (property_id) {
case PROP_CONTENT:
@@ -236,8 +233,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
LmMessageNode *transport_node, GError **error)
{
GabbleJingleTransportGoogle *t = GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (t);
+ GabbleJingleTransportGooglePrivate *priv = t->priv;
GList *candidates = NULL;
LmMessageNode *node;
@@ -375,8 +371,7 @@ parse_candidates (GabbleJingleTransportIface *obj,
static void
transmit_candidates (GabbleJingleTransportGoogle *transport, GList *candidates)
{
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (transport);
+ GabbleJingleTransportGooglePrivate *priv = transport->priv;
JingleDialect dialect;
GList *li;
LmMessage *msg;
@@ -484,8 +479,7 @@ add_candidates (GabbleJingleTransportIface *obj, GList *new_candidates)
{
GabbleJingleTransportGoogle *transport =
GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (transport);
+ GabbleJingleTransportGooglePrivate *priv = transport->priv;
JingleContentState state;
g_object_get (priv->content, "state", &state, NULL);
@@ -516,8 +510,7 @@ retransmit_candidates (GabbleJingleTransportIface *obj, gboolean all)
{
GabbleJingleTransportGoogle *transport =
GABBLE_JINGLE_TRANSPORT_GOOGLE (obj);
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (transport);
+ GabbleJingleTransportGooglePrivate *priv = transport->priv;
if (all)
{
@@ -541,8 +534,7 @@ get_remote_candidates (GabbleJingleTransportIface *iface)
{
GabbleJingleTransportGoogle *transport =
GABBLE_JINGLE_TRANSPORT_GOOGLE (iface);
- GabbleJingleTransportGooglePrivate *priv =
- GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE (transport);
+ GabbleJingleTransportGooglePrivate *priv = transport->priv;
return priv->remote_candidates;
}
diff --git a/src/media-channel.c b/src/media-channel.c
index 405cede..940c3d6 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -177,8 +177,6 @@ struct _delayed_request_streams_ctx {
static void destroy_request (struct _delayed_request_streams_ctx *ctx,
gpointer user_data);
-#define GABBLE_MEDIA_CHANNEL_GET_PRIVATE(obj) (obj->priv)
-
static void
gabble_media_channel_init (GabbleMediaChannel *self)
{
@@ -208,7 +206,7 @@ static gboolean contact_is_media_capable (GabbleMediaChannel *chan, TpHandle pee
static void
_create_streams (GabbleMediaChannel *chan)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GList *contents, *li;
contents = gabble_jingle_session_get_contents (priv->session);
@@ -223,7 +221,7 @@ _create_streams (GabbleMediaChannel *chan)
static void
_latch_to_session (GabbleMediaChannel *chan)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
g_assert (priv->session != NULL);
@@ -249,7 +247,7 @@ _latch_to_session (GabbleMediaChannel *chan)
static void
create_session (GabbleMediaChannel *chan, TpHandle peer)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
g_assert (priv->session == NULL);
@@ -280,7 +278,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
obj = G_OBJECT_CLASS (gabble_media_channel_parent_class)->
constructor (type, n_props, props);
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (GABBLE_MEDIA_CHANNEL (obj));
+ priv = GABBLE_MEDIA_CHANNEL (obj)->priv;
conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -366,7 +364,7 @@ gabble_media_channel_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (object);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
TpBaseConnection *base_conn = (TpBaseConnection *) priv->conn;
const gchar *param_name;
guint tp_property_id;
@@ -496,7 +494,7 @@ gabble_media_channel_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (object);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
const gchar *param_name;
guint tp_property_id;
@@ -725,7 +723,7 @@ void
gabble_media_channel_dispose (GObject *object)
{
GabbleMediaChannel *self = GABBLE_MEDIA_CHANNEL (object);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (
conn, TP_HANDLE_TYPE_CONTACT);
@@ -772,7 +770,7 @@ void
gabble_media_channel_finalize (GObject *object)
{
GabbleMediaChannel *self = GABBLE_MEDIA_CHANNEL (object);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
g_free (priv->object_path);
@@ -809,7 +807,7 @@ gabble_media_channel_close (GabbleMediaChannel *self)
g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
if (priv->closed)
{
@@ -894,7 +892,7 @@ gabble_media_channel_get_session_handlers (TpSvcChannelInterfaceMediaSignalling
g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
if (priv->session)
{
@@ -933,7 +931,7 @@ make_stream_list (GabbleMediaChannel *self,
guint len,
GabbleMediaStream **streams)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
GPtrArray *ret;
guint i;
GType info_type = TP_STRUCT_TYPE_MEDIA_STREAM_INFO;
@@ -993,7 +991,7 @@ gabble_media_channel_list_streams (TpSvcChannelTypeStreamedMedia *iface,
g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
/* no session yet? return an empty array */
if (priv->session == NULL)
@@ -1020,7 +1018,7 @@ _find_stream_by_id (GabbleMediaChannel *chan, guint stream_id)
g_assert (GABBLE_IS_MEDIA_CHANNEL (chan));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ priv = chan->priv;
for (i = 0; i < priv->streams->len; i++)
{
@@ -1054,7 +1052,7 @@ gabble_media_channel_remove_streams (TpSvcChannelTypeStreamedMedia *iface,
g_assert (GABBLE_IS_MEDIA_CHANNEL (obj));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (obj);
+ priv = obj->priv;
stream_objs = g_ptr_array_sized_new (streams->len);
@@ -1141,7 +1139,7 @@ gabble_media_channel_request_stream_direction (TpSvcChannelTypeStreamedMedia *if
g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
if (stream_direction > TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL)
{
@@ -1198,7 +1196,7 @@ static const gchar *
_pick_best_content_type (GabbleMediaChannel *chan, TpHandle peer,
const gchar *resource, JingleMediaType type)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GabblePresence *presence;
presence = gabble_presence_cache_get (priv->conn->presence_cache, peer);
@@ -1244,7 +1242,7 @@ _pick_best_resource (GabbleMediaChannel *chan,
TpHandle peer, gboolean want_audio, gboolean want_video,
const char **transport_ns, JingleDialect *dialect)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GabblePresence *presence;
GabblePresenceCapabilities caps;
const gchar *resource = NULL;
@@ -1466,7 +1464,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
GPtrArray **ret,
GError **error)
{
- GabbleMediaChannelPrivate *priv;
+ GabbleMediaChannelPrivate *priv = chan->priv;
gboolean want_audio, want_video;
JingleDialect dialect;
guint idx;
@@ -1474,8 +1472,6 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan,
const gchar *peer_resource;
const gchar *transport_ns = NULL;
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
-
DEBUG ("called");
g_object_get (priv->session, "peer", &peer,
@@ -1629,7 +1625,7 @@ static void
destroy_request (struct _delayed_request_streams_ctx *ctx,
gpointer user_data G_GNUC_UNUSED)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (ctx->chan);
+ GabbleMediaChannelPrivate *priv = ctx->chan->priv;
if (ctx->timeout_id)
g_source_remove (ctx->timeout_id);
@@ -1694,7 +1690,7 @@ delay_stream_request (GabbleMediaChannel *chan,
DBusGMethodInvocation *context,
gboolean disco_in_progress)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
struct _delayed_request_streams_ctx *ctx =
g_slice_new0 (struct _delayed_request_streams_ctx);
@@ -1748,7 +1744,7 @@ gabble_media_channel_request_streams (TpSvcChannelTypeStreamedMedia *iface,
/* FIXME: disallow this if we've put the other guy on hold? */
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -1819,7 +1815,7 @@ error:
static gboolean
contact_is_media_capable (GabbleMediaChannel *chan, TpHandle peer, gboolean *wait)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GabblePresence *presence;
GabblePresenceCapabilities caps;
#ifdef ENABLE_DEBUG
@@ -1867,7 +1863,7 @@ _gabble_media_channel_add_member (GObject *obj,
GError **error)
{
GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (obj);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
/* did we create this channel? */
@@ -1976,7 +1972,7 @@ gabble_media_channel_remove_member (GObject *obj,
GError **error)
{
GabbleMediaChannel *chan = GABBLE_MEDIA_CHANNEL (obj);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
TpIntSet *set;
@@ -2021,7 +2017,7 @@ session_terminated_cb (GabbleJingleSession *session,
gpointer user_data)
{
GabbleMediaChannel *channel = (GabbleMediaChannel *) user_data;
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (channel);
+ GabbleMediaChannelPrivate *priv = channel->priv;
TpGroupMixin *mixin = TP_GROUP_MIXIN (channel);
guint reason = TP_CHANNEL_GROUP_CHANGE_REASON_NONE;
guint terminator;
@@ -2093,7 +2089,7 @@ session_state_changed_cb (GabbleJingleSession *session,
GParamSpec *arg1,
GabbleMediaChannel *channel)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (channel);
+ GabbleMediaChannelPrivate *priv = channel->priv;
TpGroupMixin *mixin = TP_GROUP_MIXIN (channel);
JingleSessionState state;
TpHandle peer;
@@ -2179,7 +2175,7 @@ stream_hold_state_changed (GabbleMediaStream *stream G_GNUC_UNUSED,
gpointer data)
{
GabbleMediaChannel *self = data;
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
gboolean all_held = TRUE, any_held = FALSE;
guint i;
@@ -2297,7 +2293,7 @@ stream_unhold_failed (GabbleMediaStream *stream,
gpointer data)
{
GabbleMediaChannel *self = data;
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
guint i;
DEBUG ("%p: %p", self, stream);
@@ -2330,7 +2326,7 @@ static void
stream_close_cb (GabbleMediaStream *stream,
GabbleMediaChannel *chan)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
guint id;
g_assert (GABBLE_IS_MEDIA_CHANNEL (chan));
@@ -2360,7 +2356,7 @@ stream_error_cb (GabbleMediaStream *stream,
const gchar *message,
GabbleMediaChannel *chan)
{
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GabbleJingleContent *c;
guint id;
@@ -2459,7 +2455,7 @@ construct_stream (GabbleMediaChannel *chan,
const GPtrArray *relays)
{
GObject *chan_o = (GObject *) chan;
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (chan);
+ GabbleMediaChannelPrivate *priv = chan->priv;
GabbleMediaStream *stream;
TpMediaStreamType mtype;
guint id;
@@ -2735,7 +2731,7 @@ gabble_media_channel_get_hold_state (TpSvcChannelInterfaceHold *iface,
DBusGMethodInvocation *context)
{
GabbleMediaChannel *self = (GabbleMediaChannel *) iface;
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
tp_svc_channel_interface_hold_return_from_get_hold_state (context,
priv->hold_state, priv->hold_state_reason);
@@ -2748,7 +2744,7 @@ gabble_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
DBusGMethodInvocation *context)
{
GabbleMediaChannel *self = GABBLE_MEDIA_CHANNEL (iface);
- GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
guint i;
TpLocalHoldState old_state = priv->hold_state;
@@ -2826,8 +2822,7 @@ gabble_media_channel_ready (TpSvcMediaSessionHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaChannel *self = GABBLE_MEDIA_CHANNEL (iface);
- GabbleMediaChannelPrivate *priv =
- GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ GabbleMediaChannelPrivate *priv = self->priv;
if (!priv->ready)
{
@@ -2856,7 +2851,7 @@ gabble_media_channel_error (TpSvcMediaSessionHandler *iface,
g_assert (GABBLE_IS_MEDIA_CHANNEL (self));
- priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
+ priv = self->priv;
DEBUG ("Media.SessionHandler::Error called, error %u (%s) -- "
"emitting error on each stream", errno, message);
diff --git a/src/media-stream.c b/src/media-stream.c
index b33a502..05167e3 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -137,8 +137,6 @@ struct _GabbleMediaStreamPrivate
unsigned created_locally:1;
};
-#define GABBLE_MEDIA_STREAM_GET_PRIVATE(obj) ((obj)->priv)
-
static void push_remote_codecs (GabbleMediaStream *stream);
static void push_remote_candidates (GabbleMediaStream *stream);
static void push_playing (GabbleMediaStream *stream);
@@ -231,7 +229,7 @@ static gboolean
_get_initial_codecs_and_candidates (gpointer user_data)
{
GabbleMediaStream *stream = GABBLE_MEDIA_STREAM (user_data);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
priv->initial_getter_id = 0;
@@ -265,7 +263,7 @@ gabble_media_stream_constructor (GType type, guint n_props,
obj = G_OBJECT_CLASS (gabble_media_stream_parent_class)->
constructor (type, n_props, props);
stream = GABBLE_MEDIA_STREAM (obj);
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
g_assert (priv->content != NULL);
@@ -325,7 +323,7 @@ gabble_media_stream_get_property (GObject *object,
GParamSpec *pspec)
{
GabbleMediaStream *stream = GABBLE_MEDIA_STREAM (object);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
switch (property_id) {
case PROP_OBJECT_PATH:
@@ -383,7 +381,7 @@ gabble_media_stream_set_property (GObject *object,
GParamSpec *pspec)
{
GabbleMediaStream *stream = GABBLE_MEDIA_STREAM (object);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
switch (property_id) {
case PROP_OBJECT_PATH:
@@ -675,7 +673,7 @@ void
gabble_media_stream_dispose (GObject *object)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (object);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
DEBUG ("called");
@@ -705,7 +703,7 @@ void
gabble_media_stream_finalize (GObject *object)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (object);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
g_free (priv->object_path);
g_free (priv->nat_traversal);
@@ -742,7 +740,7 @@ gabble_media_stream_codec_choice (TpSvcMediaStreamHandler *iface,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
tp_svc_media_stream_handler_return_from_codec_choice (context);
}
@@ -758,7 +756,7 @@ gabble_media_stream_error (GabbleMediaStream *self,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
DEBUG ( "Media.StreamHandler::Error called, error %u (%s) -- emitting signal",
errno, message);
@@ -782,7 +780,7 @@ gabble_media_stream_error_async (TpSvcMediaStreamHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
GError *error = NULL;
/* description-info is purely advisory; if the streaming implementation
@@ -830,7 +828,7 @@ gabble_media_stream_hold_state (TpSvcMediaStreamHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
DEBUG ("%p: %s", self, hold_state ? "held" : "unheld");
priv->local_hold = hold_state;
@@ -853,7 +851,7 @@ gabble_media_stream_unhold_failure (TpSvcMediaStreamHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
DEBUG ("%p", self);
@@ -881,7 +879,7 @@ gabble_media_stream_native_candidates_prepared (TpSvcMediaStreamHandler *iface,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
tp_svc_media_stream_handler_return_from_native_candidates_prepared (context);
}
@@ -904,7 +902,7 @@ gabble_media_stream_new_active_candidate_pair (TpSvcMediaStreamHandler *iface,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
g_signal_emit (self, signals[NEW_ACTIVE_CANDIDATE_PAIR], 0,
native_candidate_id, remote_candidate_id);
@@ -940,7 +938,7 @@ gabble_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
g_object_get (priv->content->session, "state", &state, NULL);
@@ -1076,7 +1074,7 @@ gabble_media_stream_ready (TpSvcMediaStreamHandler *iface,
g_assert (GABBLE_IS_MEDIA_STREAM (self));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ priv = self->priv;
DEBUG ("ready called");
@@ -1103,7 +1101,7 @@ pass_local_codecs (GabbleMediaStream *stream,
const GPtrArray *codecs,
GError **error)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
GList *li = NULL;
JingleCodec *c;
guint i;
@@ -1191,7 +1189,7 @@ gabble_media_stream_stream_state (TpSvcMediaStreamHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
JingleTransportState ts = JINGLE_TRANSPORT_STATE_DISCONNECTED;
switch (connection_state) {
@@ -1229,7 +1227,7 @@ gabble_media_stream_supported_codecs (TpSvcMediaStreamHandler *iface,
DBusGMethodInvocation *context)
{
GabbleMediaStream *self = GABBLE_MEDIA_STREAM (iface);
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (self);
+ GabbleMediaStreamPrivate *priv = self->priv;
GError *error = NULL;
DEBUG ("called");
@@ -1307,7 +1305,7 @@ _gabble_media_stream_close (GabbleMediaStream *stream)
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
if (!priv->closed)
{
@@ -1320,7 +1318,7 @@ static void
new_remote_codecs_cb (GabbleJingleContent *content,
GList *clist, GabbleMediaStream *stream)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv;
GList *li;
GPtrArray *codecs;
GType codec_struct_type = TP_STRUCT_TYPE_MEDIA_STREAM_HANDLER_CODEC;
@@ -1329,7 +1327,7 @@ new_remote_codecs_cb (GabbleJingleContent *content,
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
codecs = g_value_get_boxed (&priv->remote_codecs);
@@ -1386,7 +1384,7 @@ push_remote_codecs (GabbleMediaStream *stream)
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
if (!priv->ready)
return;
@@ -1408,7 +1406,7 @@ static void
new_remote_candidates_cb (GabbleJingleContent *content,
GList *clist, GabbleMediaStream *stream)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
GPtrArray *candidates;
GList *li;
@@ -1471,7 +1469,7 @@ content_state_changed_cb (GabbleJingleContent *c,
GParamSpec *pspec,
GabbleMediaStream *stream)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
JingleContentState state;
g_object_get (c, "state", &state, NULL);
@@ -1509,7 +1507,7 @@ push_remote_candidates (GabbleMediaStream *stream)
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
candidates = g_value_get_boxed (&priv->remote_candidates);
@@ -1544,7 +1542,7 @@ push_playing (GabbleMediaStream *stream)
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
if (!priv->ready)
return;
@@ -1563,7 +1561,7 @@ push_sending (GabbleMediaStream *stream)
g_assert (GABBLE_IS_MEDIA_STREAM (stream));
- priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ priv = stream->priv;
if (!priv->ready)
return;
@@ -1648,7 +1646,7 @@ gboolean
gabble_media_stream_change_direction (GabbleMediaStream *stream,
guint requested_dir, GError **error)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
CombinedStreamDirection new_combined_dir;
TpMediaStreamDirection current_dir;
TpMediaStreamPendingSend pending_send;
@@ -1754,7 +1752,7 @@ gabble_media_stream_accept_pending_local_send (GabbleMediaStream *stream)
static void
update_sending (GabbleMediaStream *stream, gboolean start_sending)
{
- GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
+ GabbleMediaStreamPrivate *priv = stream->priv;
gboolean new_sending;
new_sending =
--
1.5.6.5
More information about the telepathy-commits
mailing list