[next] telepathy-glib: StreamTube: update to new spec

[Xavier Claessens]

Module: telepathy-glib
Branch: next
Commit: 6d36e2c81570dc58a3046238ca39314b09548a83
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=6d36e2c81570dc58a3046238ca39314b09548a83

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed May  9 13:30:40 2012 +0200

StreamTube: update to new spec

We now have remote contact id

---

 spec/Channel_Type_Stream_Tube1.xml   |    5 +++++
 telepathy-glib/stream-tube-channel.c |    1 +
 tests/lib/stream-tube-chan.c         |    7 ++++++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/spec/Channel_Type_Stream_Tube1.xml b/spec/Channel_Type_Stream_Tube1.xml
index e2f169d..51244a1 100644
--- a/spec/Channel_Type_Stream_Tube1.xml
+++ b/spec/Channel_Type_Stream_Tube1.xml
@@ -149,6 +149,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           The handle of the participant who opened the new connection
         </tp:docstring>
       </arg>
+      <arg name="Identifier" type="s">
+        <tp:docstring>
+          The identifier of the participant who opened the new connection
+        </tp:docstring>
+      </arg>
       <arg name="Connection_Param" type="v">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>A parameter which can be used by the listening process to identify
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index d74e7f4..0d15978 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -1086,6 +1086,7 @@ connection_rejected (TpStreamTubeChannel *self,
 static void
 _new_remote_connection (TpChannel *channel,
     guint handle,
+    const gchar *id,
     const GValue *param,
     guint connection_id,
     gpointer user_data,
diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
index 6c01566..26ab824 100644
--- a/tests/lib/stream-tube-chan.c
+++ b/tests/lib/stream-tube-chan.c
@@ -522,6 +522,10 @@ tp_tests_stream_tube_channel_peer_connected (TpTestsStreamTubeChannel *self,
     TpHandle handle)
 {
   GValue *connection_param;
+  TpBaseChannel *base = (TpBaseChannel *) self;
+  TpBaseConnection *conn = tp_base_channel_get_connection (base);
+  TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
+      TP_HANDLE_TYPE_CONTACT);
 
   if (self->priv->state == TP_TUBE_CHANNEL_STATE_REMOTE_PENDING)
     change_state (self, TP_TUBE_CHANNEL_STATE_OPEN);
@@ -582,7 +586,8 @@ tp_tests_stream_tube_channel_peer_connected (TpTestsStreamTubeChannel *self,
     }
 
   tp_svc_channel_type_stream_tube_emit_new_remote_connection (self, handle,
-      connection_param, self->priv->connection_id);
+      tp_handle_inspect (contact_repo, handle), connection_param,
+      self->priv->connection_id);
 
   self->priv->connection_id++;