[telepathy-gabble/master] Add _content_creator_is_initiator()
Will Thompson
will.thompson at collabora.co.uk
Thu Jun 11 08:11:23 PDT 2009
---
src/jingle-content.c | 17 +++++++++++------
src/jingle-content.h | 1 +
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/jingle-content.c b/src/jingle-content.c
index 49e12c0..1966f92 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -676,18 +676,13 @@ gabble_jingle_content_produce_node (GabbleJingleContent *c,
}
else
{
- gboolean session_created_by_us;
-
content_node = lm_message_node_add_child (parent, "content", NULL);
lm_message_node_set_attributes (content_node,
"name", priv->name,
"senders", produce_senders (priv->senders),
NULL);
- g_object_get (c->session, "local-initiator", &session_created_by_us,
- NULL);
-
- if (priv->created_by_us == session_created_by_us)
+ if (gabble_jingle_content_creator_is_initiator (c))
lm_message_node_set_attribute (content_node, "creator", "initiator");
else
lm_message_node_set_attribute (content_node, "creator", "responder");
@@ -1015,6 +1010,16 @@ gabble_jingle_content_is_created_by_us (GabbleJingleContent *c)
return c->priv->created_by_us;
}
+gboolean
+gabble_jingle_content_creator_is_initiator (GabbleJingleContent *c)
+{
+ gboolean session_created_by_us;
+
+ g_object_get (c->session, "local-initiator", &session_created_by_us, NULL);
+
+ return (c->priv->created_by_us == session_created_by_us);
+}
+
const gchar *
gabble_jingle_content_get_name (GabbleJingleContent *self)
{
diff --git a/src/jingle-content.h b/src/jingle-content.h
index 0bed069..c450549 100644
--- a/src/jingle-content.h
+++ b/src/jingle-content.h
@@ -119,6 +119,7 @@ gboolean gabble_jingle_content_change_direction (GabbleJingleContent *c,
JingleContentSenders senders);
void gabble_jingle_content_retransmit_candidates (GabbleJingleContent *self);
gboolean gabble_jingle_content_is_created_by_us (GabbleJingleContent *c);
+gboolean gabble_jingle_content_creator_is_initiator (GabbleJingleContent *c);
const gchar *gabble_jingle_content_get_name (GabbleJingleContent *self);
--
1.5.6.5
More information about the telepathy-commits
mailing list