summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-05 16:34:08 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-05 16:34:08 -0500
commitb64e1674925ae432af04b40a75a27d946f6ca87b (patch)
tree87183bb66ae89982d6ee8f846a0559a293539dfe
parente40399b303cb9b53e24da8122fc8f4f36bdc5d2e (diff)
downloadtelepathy-farstream-b64e1674925ae432af04b40a75a27d946f6ca87b.tar.gz
Put all setting of the endpoint path at the same place
-rw-r--r--telepathy-farstream/call-stream.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index bd65e9d..cf48ee2 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -818,10 +818,12 @@ got_endpoint_properties (TpProxy *proxy, GHashTable *out_Properties,
}
static void
-tf_call_stream_add_endpoint (TfCallStream *self)
+tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path)
{
GError *error = NULL;
+ self->endpoint_objpath = g_strdup (obj_path);
+
tp_call_stream_endpoint_init_known_interfaces ();
self->endpoint = g_object_new (TP_TYPE_PROXY,
"dbus-daemon", tp_proxy_get_dbus_daemon (self->proxy),
@@ -906,9 +908,8 @@ endpoints_changed (TpCallStream *proxy,
return;
}
- self->endpoint_objpath = g_strdup (
+ tf_call_stream_add_endpoint (self,
g_ptr_array_index (arg_Endpoints_Added, 0));
- tf_call_stream_add_endpoint (self);
}
@@ -1017,8 +1018,7 @@ got_stream_media_properties (TpProxy *proxy, GHashTable *out_Properties,
if (endpoints->len == 1)
{
- self->endpoint_objpath = g_strdup (g_ptr_array_index (endpoints, 0));
- tf_call_stream_add_endpoint (self);
+ tf_call_stream_add_endpoint (self, g_ptr_array_index (endpoints, 0));
}
self->has_media_properties = TRUE;