[telepathy-gabble/master] add SOCKET_ADDRESS_TYPE_IPV4 to AvailableSocketTypes

[Guillaume Desmottes]

---
 src/ft-channel.c                                   |   18 +++++++++++++-----
 .../twisted/file-transfer/file_transfer_helper.py  |    8 ++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/ft-channel.c b/src/ft-channel.c
index 7d8a785..f04b8ad 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -422,7 +422,7 @@ gabble_file_transfer_channel_constructor (GType type,
   DBusGConnection *bus;
   TpBaseConnection *base_conn;
   TpHandleRepoIface *contact_repo;
-  GArray *unix_access;
+  GArray *socket_access;
   TpSocketAccessControl access_control;
 
   /* Parent constructor chain */
@@ -451,12 +451,20 @@ gabble_file_transfer_channel_constructor (GType type,
       g_direct_equal, NULL, (GDestroyNotify) free_array);
 
   /* Socket_Address_Type_Unix */
-  unix_access = g_array_sized_new (FALSE, FALSE, sizeof (TpSocketAccessControl),
-      1);
+  socket_access = g_array_sized_new (FALSE, FALSE,
+      sizeof (TpSocketAccessControl), 1);
   access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
-  g_array_append_val (unix_access, access_control);
+  g_array_append_val (socket_access, access_control);
   g_hash_table_insert (self->priv->available_socket_types,
-      GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_UNIX), unix_access);
+      GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_UNIX), socket_access);
+
+  /* Socket_Address_Type_IPv4 */
+  socket_access = g_array_sized_new (FALSE, FALSE,
+      sizeof (TpSocketAccessControl), 1);
+  access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
+  g_array_append_val (socket_access, access_control);
+  g_hash_table_insert (self->priv->available_socket_types,
+      GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV4), socket_access);
 
   gabble_signal_connect_weak (self->priv->connection->presence_cache,
       "presences-updated", G_CALLBACK (connection_presences_updated_cb), obj);
diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 5ebb00b..d6be3d7 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -188,7 +188,9 @@ class ReceiveFileTest(FileTransferTest):
         assert props[cs.FT_DESCRIPTION] == self.file.description
         assert props[cs.FT_DATE] == self.file.date
         assert props[cs.FT_AVAILABLE_SOCKET_TYPES] == \
-            {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}
+            {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST],
+            cs.SOCKET_ADDRESS_TYPE_IPV4: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}, \
+            props[cs.FT_AVAILABLE_SOCKET_TYPES]
         assert props[cs.FT_TRANSFERRED_BYTES] == 0
         assert props[cs.FT_INITIAL_OFFSET] == 0
 
@@ -326,7 +328,9 @@ class SendFileTest(FileTransferTest):
         assert props[cs.FT_DESCRIPTION] == self.file.description
         assert props[cs.FT_DATE] == self.file.date
         assert props[cs.FT_AVAILABLE_SOCKET_TYPES] == \
-            {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}
+            {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST],
+            cs.SOCKET_ADDRESS_TYPE_IPV4: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}, \
+            props[cs.FT_AVAILABLE_SOCKET_TYPES]
         assert props[cs.FT_TRANSFERRED_BYTES] == 0
         assert props[cs.FT_INITIAL_OFFSET] == 0
 
-- 
1.5.6.5