summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-transport-unix.c
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2009-07-16 16:05:16 +0200
committerThiago Macieira <thiago@kde.org>2009-07-16 16:05:16 +0200
commit37019e9d271390fa8c62c1aae62d30bb9068adaa (patch)
tree536d5838b73939a6a885f4ef61de1c18814b9529 /dbus/dbus-transport-unix.c
parent56f7ce147e82c7eb529ccba634013e97d53b23c0 (diff)
parent9f06daccce3f4e75cfac7c97bfb1743affb55cb2 (diff)
Merge branch 'fd-passing'
Conflicts: dbus/dbus-connection.c dbus/dbus-message-util.c dbus/dbus-sysdeps-unix.c
Diffstat (limited to 'dbus/dbus-transport-unix.c')
-rw-r--r--dbus/dbus-transport-unix.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index a4452aa1..2f2a3da5 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -85,8 +85,6 @@ _dbus_transport_new_for_domain_socket (const char *path,
goto failed_0;
}
- _dbus_fd_set_close_on_exec (fd);
-
_dbus_verbose ("Successfully connected to unix socket %s\n",
path);