Fixed building issues after merge

gsocket.c uses enums from gnioenumtypes.h and gtcpclient.c did call
g_socket_new with an old interface.

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index c89d10b..5005cc2 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include "gasynchelper.h"
+#include "gnioenumtypes.h"
 
 #include <string.h>
 #ifndef G_OS_WIN32

diff --git a/gnio/gtcpclient.c b/gnio/gtcpclient.c
index 8978897..479cd00 100644 (file)
--- a/gnio/gtcpclient.c
+++ b/gnio/gtcpclient.c
@@ -415,9 +415,9 @@ g_tcp_client_connect_async (GTcpClient          *client,
   address = g_inet_socket_address_get_address (client->priv->address);
 
   if (G_IS_INET4_ADDRESS (address))
-    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, &error);
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL);
   else if (G_IS_INET6_ADDRESS (address))
-    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET6, G_SOCKET_TYPE_STREAM, NULL, &error);
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET6, G_SOCKET_TYPE_STREAM, NULL);
   else
     {
       g_simple_async_report_error_in_idle (G_OBJECT (client), callback, user_data, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported address domain");