Change to using enums for g_socket_new

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

diff --git a/gnio/gsocket.h b/gnio/gsocket.h
index 678ef03..0affe7c 100644 (file)
--- a/gnio/gsocket.h
+++ b/gnio/gsocket.h
@@ -55,9 +55,23 @@ struct _GSocketClass
   GObjectClass parent_class;
 };
 
+typedef enum
+{
+  G_SOCKET_DOMAIN_INET,
+  G_SOCKET_DOMAIN_INET6,
+  G_SOCKET_DOMAIN_UNIX
+} GSocketDomain;
+
+typedef enum
+{
+  G_SOCKET_TYPE_STREAM,
+  G_SOCKET_TYPE_DATAGRAM,
+  G_SOCKET_TYPE_SEQPACKET
+} GSocketType;
+
 GType            g_socket_get_type         (void) G_GNUC_CONST;
 
-GSocket *        g_socket_new              (gint domain, gint type, gint protocol);
+GSocket *        g_socket_new              (GSocketDomain domain, GSocketType type, const gchar *protocol, GError **error);
 
 GSocket *        g_socket_new_from_fd      (gint fd);
 
@@ -80,7 +94,7 @@ gboolean         g_socket_connect          (GSocket         *socket,
 void             g_socket_connect_async    (GSocket             *socket,
                                             GSocketAddress      *address,
                                             GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
+                                            GAsyncReadyCallback  callback,
                                             gpointer             user_data);
 
 gboolean         g_socket_connect_finish   (GSocket       *socket,
@@ -113,7 +127,7 @@ void             g_socket_receive_async    (GSocket             *socket,
                                             gchar               *buffer,
                                             gsize                size,
                                             GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
+                                            GAsyncReadyCallback  callback,
                                             gpointer             user_data);
 
 gssize           g_socket_receive_finish   (GSocket       *socket,
@@ -130,7 +144,7 @@ void             g_socket_send_async       (GSocket             *socket,
                                             gchar               *buffer,
                                             gsize                size,
                                             GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
+                                            GAsyncReadyCallback  callback,
                                             gpointer             user_data);
 
 gssize           g_socket_send_finish      (GSocket       *socket,