diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
| commit | b81df5f0da5a86fe5bef05f3d8d627f6a01cee76 (patch) | |
| tree | 540d8894da5b5d4f3a0513b68af1b59ec584f530 /src/tube-stream.c | |
| parent | d8edca5135d6b9fdbec6d25441f61e1f01098f28 (diff) | |
| download | telepathy-salut-b81df5f0da5a86fe5bef05f3d8d627f6a01cee76.tar.gz | |
Revert to commit 822ddd0
Some commits intended for 'next' appear to have ended up on master.
Diffstat (limited to 'src/tube-stream.c')
| -rw-r--r-- | src/tube-stream.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tube-stream.c b/src/tube-stream.c index c55c4db1..fea5be7c 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -65,7 +65,6 @@ #include "tube-iface.h" #include "si-bytestream-manager.h" #include "contact-manager.h" -#include "util.h" static void tube_iface_init (gpointer g_iface, gpointer iface_data); static void streamtube_iface_init (gpointer g_iface, gpointer iface_data); @@ -718,8 +717,7 @@ local_new_connection_cb (GibberListener *listener, static void fire_new_remote_connection (SalutTubeStream *self, GibberTransport *transport, - TpHandle contact, - const gchar *contact_id) + TpHandle contact) { SalutTubeStreamPrivate *priv = SALUT_TUBE_STREAM_GET_PRIVATE (self); GValue access_control_param = {0,}; @@ -736,7 +734,7 @@ fire_new_remote_connection (SalutTubeStream *self, g_assert (connection_id != 0); tp_svc_channel_type_stream_tube_emit_new_remote_connection (self, - contact, contact_id, &access_control_param, connection_id); + contact, &access_control_param, connection_id); g_value_unset (&access_control_param); } @@ -1090,7 +1088,7 @@ salut_tube_stream_get_property (GObject *object, g_value_set_uint64 (value, priv->id); break; case PROP_TYPE: - g_value_set_uint (value, SALUT_TUBE_TYPE_STREAM); + g_value_set_uint (value, TP_TUBE_TYPE_STREAM); break; case PROP_SERVICE: g_value_set_string (value, priv->service); @@ -1859,7 +1857,7 @@ salut_tube_stream_add_bytestream (SalutTubeIface *tube, g_signal_emit (G_OBJECT (self), signals[NEW_CONNECTION], 0, contact); - fire_new_remote_connection (self, transport, contact, peer_id); + fire_new_remote_connection (self, transport, contact); g_free (peer_id); } @@ -2053,7 +2051,7 @@ salut_tube_stream_check_params (TpSocketAddressType address_type, * salut_tube_stream_offer_async * * Implements D-Bus method Offer - * on im.telepathy1.Channel.Type.StreamTube + * on org.freedesktop.Telepathy.Channel.Type.StreamTube */ static void salut_tube_stream_offer_async (TpSvcChannelTypeStreamTube *iface, @@ -2110,7 +2108,7 @@ salut_tube_stream_offer_async (TpSvcChannelTypeStreamTube *iface, * salut_tube_stream_accept_async * * Implements D-Bus method Accept - * on im.telepathy1.Channel.Type.StreamTube + * on org.freedesktop.Telepathy.Channel.Type.StreamTube */ static void salut_tube_stream_accept_async (TpSvcChannelTypeStreamTube *iface, |