Fix compilation errors.

2005-08-15  Tambet Ingo  <tambet@ximian.com>

	* libsoup/soup-socket.c (update_fdflags, set_property): Fix compilation
	errors.

	* libsoup/soup-server.c (soup_server_get_listener): ditto.

diff --git a/ChangeLog b/ChangeLog
index eec16f0..0adc637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-15  Tambet Ingo  <tambet@ximian.com>
+
+       * libsoup/soup-socket.c (update_fdflags, set_property): Fix compilation
+       errors.
+
+       * libsoup/soup-server.c (soup_server_get_listener): ditto.
+
 2005-08-12  Dan Winship  <danw@novell.com>
 
        * libsoup/soup-server.c (soup_server_get_listener): new method to

diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 1342df7..22f6205 100644 (file)
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -303,9 +303,12 @@ soup_server_get_protocol (SoupServer *server)
 SoupSocket *
 soup_server_get_listener (SoupServer *server)
 {
+       SoupServerPrivate *priv;
+
        g_return_val_if_fail (SOUP_IS_SERVER (server), NULL);
-       
-       return server->priv->listen_sock;
+       priv = SOUP_SERVER_GET_PRIVATE (server);
+
+       return priv->listen_sock;
 }
 
 static void start_request (SoupServer *, SoupSocket *);

diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 62ffea5..bda9249 100644 (file)
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -320,13 +320,13 @@ update_fdflags (SoupSocketPrivate *priv)
                        flags &= ~O_NONBLOCK;
                fcntl (priv->sockfd, F_SETFL, flags);
        }
-       flags = fcntl (sock->priv->sockfd, F_GETFD, 0);
+       flags = fcntl (priv->sockfd, F_GETFD, 0);
        if (flags != -1) {
-               if (sock->priv->cloexec)
+               if (priv->cloexec)
                        flags |= FD_CLOEXEC;
                else
                        flags &= ~FD_CLOEXEC;
-               fcntl (sock->priv->sockfd, F_SETFD, flags);
+               fcntl (priv->sockfd, F_SETFD, flags);
         }
 
 #else
@@ -368,8 +368,8 @@ set_property (GObject *object, guint prop_id,
                update_fdflags (priv);
                break;
        case PROP_CLOEXEC:
-               sock->priv->cloexec = g_value_get_boolean (value);
-               update_fdflags (sock);
+               priv->cloexec = g_value_get_boolean (value);
+               update_fdflags (priv);
                break;
        case PROP_SSL_CREDENTIALS:
                priv->ssl_creds = g_value_get_pointer (value);
@@ -396,7 +396,7 @@ get_property (GObject *object, guint prop_id,
                g_value_set_boolean (value, priv->reuseaddr);
                break;
        case PROP_CLOEXEC:
-               g_value_set_boolean (value, sock->priv->cloexec);
+               g_value_set_boolean (value, priv->cloexec);
                 break;
        case PROP_IS_SERVER:
                g_value_set_boolean (value, priv->is_server);