Merge "[lib-fix] Fixed return value of kdbus_write_msg Change-Id: Ia3a45a6a79b4078929...

[platform/upstream/dbus.git] / dbus / dbus-transport-socket.h

diff --git a/dbus/dbus-transport-socket.h b/dbus/dbus-transport-socket.h
index aab5991..8aefae3 100644 (file)
--- a/dbus/dbus-transport-socket.h
+++ b/dbus/dbus-transport-socket.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-transport-socket.h Socket subclasses of DBusTransport
  *
  * Copyright (C) 2002, 2006  Red Hat Inc.
@@ -17,22 +17,28 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 #ifndef DBUS_TRANSPORT_SOCKET_H
 #define DBUS_TRANSPORT_SOCKET_H
 
-#include <dbus/dbus-transport.h>
+#include <dbus/dbus-transport-protected.h>
 
 DBUS_BEGIN_DECLS
 
-DBusTransport* _dbus_transport_new_for_socket        (int               fd,
-                                                      const DBusString *server_guid,
-                                                      const DBusString *address);
-DBusTransport* _dbus_transport_new_for_tcp_socket    (const char       *host,
-                                                      dbus_int32_t      port,
-                                                      DBusError        *error);
+DBusTransport*          _dbus_transport_new_for_socket     (int                fd,
+                                                            const DBusString  *server_guid,
+                                                            const DBusString  *address);
+DBusTransport*          _dbus_transport_new_for_tcp_socket (const char        *host,
+                                                            const char        *port,
+                                                            const char        *family,
+                                                            const char        *noncefile,
+                                                            DBusError         *error);
+DBusTransportOpenResult _dbus_transport_open_socket        (DBusAddressEntry  *entry,
+                                                            DBusTransport    **transport_p,
+                                                            DBusError         *error);
+
 
 
 DBUS_END_DECLS