Merge branch 'master' into errorstate

[cascardo/gnio.git] / gnio / gtcpclient.h

diff --git a/gnio/gtcpclient.h b/gnio/gtcpclient.h
index 8a1bf7f..dd87d63 100644 (file)
--- a/gnio/gtcpclient.h
+++ b/gnio/gtcpclient.h
@@ -27,9 +27,9 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
 #include <glib-object.h>
 #include <gio/gio.h>
 

-#include "ginetsocketaddress.h"
-#include "gnetworkinputstream.h"
-#include "gnetworkoutputstream.h"
+#include <gnio/ginetsocketaddress.h>
+#include <gnio/gnetworkinputstream.h>
+#include <gnio/gnetworkoutputstream.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 


@@ -56,29 +56,32 @@ struct _GTcpClientClass
   GObjectClass parent_class;
 };
 
   GObjectClass parent_class;
 };
 

-GType            g_tcp_client_get_type         (void) G_GNUC_CONST;
+GType                  g_tcp_client_get_type          (void) G_GNUC_CONST;

 
 

-GTcpClient *     g_tcp_client_new              (const gchar *hostname,
-                                                gushort      port);
+GTcpClient *           g_tcp_client_new               (const gchar *hostname,
+                                                       gushort      port);

 
 

-GTcpClient *     g_tcp_client_new_from_address (GInetSocketAddress *address);
+GTcpClient *           g_tcp_client_new_from_address  (GInetSocketAddress *address);

 
 

-gboolean         g_tcp_client_connect          (GTcpClient      *clientt,
-                                                GCancellable    *cancellable,
-                                                GError         **error);
+GNetworkInputStream *  g_tcp_client_get_input_stream  (GTcpClient *client);

 
 

-void             g_tcp_client_connect_async    (GTcpClient          *client,
-                                                GCancellable        *cancellable,
-                                                GAsyncReadyCallback  callback,
-                                                gpointer             user_data);
+GNetworkOutputStream * g_tcp_client_get_output_stream (GTcpClient *client);

 
 

-gboolean         g_tcp_client_connect_finish   (GTcpClient    *client,
-                                                GAsyncResult  *result,
-                                                GError       **error);
+gboolean               g_tcp_client_connect           (GTcpClient    *client,
+                                                       GCancellable  *cancellable,
+                                                       GError       **error);

 
 

-void             g_tcp_client_close            (GTcpClient    *client);
+void                   g_tcp_client_connect_async     (GTcpClient          *client,
+                                                       GCancellable        *cancellable,
+                                                       GAsyncReadyCallback  callback,
+                                                       gpointer             user_data);
+
+gboolean               g_tcp_client_connect_finish    (GTcpClient    *client,
+                                                       GAsyncResult  *result,
+                                                       GError       **error);
+
+void                   g_tcp_client_close             (GTcpClient    *client);

 
 G_END_DECLS
 
 #endif /* G_TCP_CLIENT_H */
 
 G_END_DECLS
 
 #endif /* G_TCP_CLIENT_H */

-