[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-patches, updated. upstream/0.8.11-3-g80519bf

[Simon McVittie]

The following commit has been merged in the debian-patches branch:
commit 80519bf4d08250e6cdaa0deba518d5a9ffe4c184
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jul 27 21:21:15 2009 +0100

    Don't advertise support for credentials-passing on platforms where it won't work

diff --git a/src/tube-stream.c b/src/tube-stream.c
index e71fe82..e39532f 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2358,8 +2358,15 @@ gabble_tube_stream_get_supported_socket_types (void)
       1);
   access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
   g_array_append_val (unix_tab, access_control);
-  access_control = TP_SOCKET_ACCESS_CONTROL_CREDENTIALS;
-  g_array_append_val (unix_tab, access_control);
+
+  /* Credentials-passing is non-portable, so only advertise it on platforms
+   * where we have an implementation (like Linux) */
+  if (gibber_unix_transport_supports_credentials ())
+    {
+      access_control = TP_SOCKET_ACCESS_CONTROL_CREDENTIALS;
+      g_array_append_val (unix_tab, access_control);
+    }
+
   g_hash_table_insert (ret, GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_UNIX),
       unix_tab);
 

-- 
telepathy-gabble packaging