[Telepathy-commits] [telepathy-gabble/master] Fix conflict resolution:

[Alban Crequy]

This conflict resolution was broken. Fix.

|commit 6c841525009d56a49f736d3d21691ab0f7318b23
|Merge: 51c888a... 4a6d168...
|Author: Alban Crequy <alban.crequy at collabora.co.uk>
|Date:   Wed Aug 20 12:21:16 2008 +0100
|
|    Merge commit 'smcv/requestotron/1-1-tubes' into alban-request-tube-channel
|
|    Conflicts:
|
|        src/channel-manager.h
|        src/connection.c
|        src/private-tubes-factory.c
|        tests/twisted/text/respawn.py
|        tests/twisted/tubes/test-si-tubes.py
---
 src/connection.c              |    4 ++++
 tests/twisted/text/respawn.py |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 0976486..86969b2 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -265,6 +265,10 @@ gabble_connection_constructor (GType type,
   conn_olpc_activity_properties_init (self);
   gabble_conn_requests_init (self);
 
+  tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (self),
+      TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES,
+          conn_capabilities_fill_contact_attributes);
+
   self->bytestream_factory = gabble_bytestream_factory_new (self);
 
   self->avatar_requests = g_hash_table_new (NULL, NULL);
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index d383846..86191c1 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -66,8 +66,6 @@ def test(q, bus, conn, stream):
             'org.freedesktop.Telepathy.Channel.FUTURE',
             dbus_interface='org.freedesktop.DBus.Properties')
     assert future_props['Requested'] == True
-    assert future_props['TargetID'] == jid,\
-            (future_props['TargetID'], jid)
     assert future_props['InitiatorHandle'] == self_handle,\
             (future_props['InitiatorHandle'], self_handle)
     assert future_props['InitiatorID'] == 'test at localhost',\
-- 
1.5.6.5