Programatically determine the platform support for abstract sockets.

2 files changed, 22 insertions, 18 deletions

diff --git a/src/modes/thread_view/page_client.cc b/src/modes/thread_view/page_client.cc
index 5e5c63a..a151b58 100644
--- a/src/modes/thread_view/page_client.cc
+++ b/src/modes/thread_view/page_client.cc
@@ -116,18 +116,20 @@ namespace Astroid {
     /* set up unix socket */
     LOG (warn) << "pc: id: " << id;
 
-    socket_addr = ustring::compose ("%1/astroid.%2.%3.%4",
-        astroid->standard_paths ().socket_dir.c_str(),
-        getpid(),
-        id,
-        UstringUtils::random_alphanumeric (30));
-
-    refptr<Gio::UnixSocketAddress> addr = Gio::UnixSocketAddress::create (socket_addr,
-# if defined __FreeBSD__ || defined __APPLE__
-        Gio::UNIX_SOCKET_ADDRESS_PATH);
-# elif
-        Gio::UNIX_SOCKET_ADDRESS_ABSTRACT);
-# endif
+    refptr<Gio::UnixSocketAddress> addr;
+    if(Gio::UnixSocketAddress::abstract_names_supported ()) {
+      addr = Gio::UnixSocketAddress::create (socket_addr,
+          Gio::UNIX_SOCKET_ADDRESS_ABSTRACT);
+    } else {
+      socket_addr = ustring::compose ("%1/astroid.%2.%3.%4",
+          astroid->standard_paths ().socket_dir.c_str(),
+          getpid(),
+          id,
+          UstringUtils::random_alphanumeric (30));
+
+      addr = Gio::UnixSocketAddress::create (socket_addr,
+          Gio::UNIX_SOCKET_ADDRESS_PATH);
+    }
 
     refptr<Gio::SocketAddress> eaddr;
 
diff --git a/src/modes/thread_view/webextension/tvextension.cc b/src/modes/thread_view/webextension/tvextension.cc
index 7078cde..27a6f03 100644
--- a/src/modes/thread_view/webextension/tvextension.cc
+++ b/src/modes/thread_view/webextension/tvextension.cc
@@ -146,12 +146,14 @@ AstroidExtension::AstroidExtension (
   gsize sz;
   const char * caddr = g_variant_get_string ((GVariant *) gaddr, &sz);
 
-  refptr<Gio::UnixSocketAddress> addr = Gio::UnixSocketAddress::create (caddr,
-# if defined __FreeBSD__ || defined __APPLE__
-      Gio::UNIX_SOCKET_ADDRESS_PATH);
-# elif
-      Gio::UNIX_SOCKET_ADDRESS_ABSTRACT);
-# endif
+  refptr<Gio::UnixSocketAddress> addr;
+  if(Gio::UnixSocketAddress::abstract_names_supported ()) {
+    addr = Gio::UnixSocketAddress::create (caddr,
+        Gio::UNIX_SOCKET_ADDRESS_ABSTRACT);
+  } else {
+    addr = Gio::UnixSocketAddress::create (caddr,
+        Gio::UNIX_SOCKET_ADDRESS_PATH);
+  }
 
   /* connect to socket */
   cli = Gio::SocketClient::create ();