Move SoupSocketProperties declarations to its own header

8 files changed, 45 insertions, 35 deletions

diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index a7463352..78e0c7d0 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -26,6 +26,7 @@ ignore_headers = [
   'soup-cache-client-input-stream.h',
   'soup-socket.h',
   'soup-socket-private.h',
+  'soup-socket-properties.h',
   'soup-websocket-extension-manager-private.h',
   'soup-misc.h',
   'soup-date-utils-private.h',
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index d585efd9..b9870971 100644
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -13,7 +13,7 @@
 #include "soup.h"
 #include "soup-io-stream.h"
 #include "soup-message-queue.h"
-#include "soup-socket-private.h"
+#include "soup-socket-properties.h"
 #include "soup-private-enum-types.h"
 #include <gio/gnetworking.h>
 
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index f2b13fdd..4ce6bb25 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -26,7 +26,6 @@
 #include "soup-message-private.h"
 #include "soup-message-queue.h"
 #include "soup-misc.h"
-#include "soup-socket-private.h"
 
 struct _SoupClientMessageIOData {
 	SoupMessageIOData base;
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 6e9e4aca..3646e1ac 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -22,7 +22,7 @@
 #include "soup-misc.h"
 #include "soup-message-queue.h"
 #include "soup-session-private.h"
-#include "soup-socket-private.h"
+#include "soup-socket-properties.h"
 #include "websocket/soup-websocket.h"
 #include "websocket/soup-websocket-connection.h"
 #include "websocket/soup-websocket-extension-manager-private.h"
diff --git a/libsoup/soup-socket-private.h b/libsoup/soup-socket-private.h
index 700e2b25..2c320aff 100644
--- a/libsoup/soup-socket-private.h
+++ b/libsoup/soup-socket-private.h
@@ -40,35 +40,4 @@ SoupURI   *soup_socket_get_http_proxy_uri      (SoupSocket           *sock);
 gboolean   soup_socket_listen_full             (SoupSocket           *sock,
                                                 GError              **error);
 
-
-
-typedef struct {
-	GProxyResolver *proxy_resolver;
-	GInetSocketAddress *local_addr;
-
-	GTlsDatabase *tlsdb;
-	GTlsInteraction *tls_interaction;
-	gboolean ssl_strict;
-
-	guint io_timeout;
-	guint idle_timeout;
-
-	/*< private >*/
-	guint ref_count;
-} SoupSocketProperties;
-
-GType soup_socket_properties_get_type (void);
-#define SOUP_TYPE_SOCKET_PROPERTIES (soup_socket_properties_get_type ())
-
-SoupSocketProperties *soup_socket_properties_new   (GProxyResolver     *proxy_resolver,
-			                            GInetSocketAddress *local_addr,
-						    GTlsDatabase       *tlsdb,
-						    GTlsInteraction    *tls_interaction,
-						    gboolean            ssl_strict,
-						    guint               io_timeout,
-						    guint               idle_timeout);
-
-SoupSocketProperties *soup_socket_properties_ref   (SoupSocketProperties *props);
-void                  soup_socket_properties_unref (SoupSocketProperties *props);
-
 #endif /* __SOUP_SOCKET_PRIVATE_H__ */
diff --git a/libsoup/soup-socket-properties.c b/libsoup/soup-socket-properties.c
index 8e132435..bbd55076 100644
--- a/libsoup/soup-socket-properties.c
+++ b/libsoup/soup-socket-properties.c
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include "soup-socket-private.h"
+#include "soup-socket-properties.h"
 #include "soup.h"
 
 SoupSocketProperties *
diff --git a/libsoup/soup-socket-properties.h b/libsoup/soup-socket-properties.h
new file mode 100644
index 00000000..9a43184c
--- /dev/null
+++ b/libsoup/soup-socket-properties.h
@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright 2011-2014 Red Hat, Inc.
+ */
+
+#ifndef __SOUP_SOCKET_PROPERTIES_H__
+#define __SOUP_SOCKET_PROPERTIES_H__ 1
+
+#include <gio/gio.h>
+
+typedef struct {
+	GProxyResolver *proxy_resolver;
+	GInetSocketAddress *local_addr;
+
+	GTlsDatabase *tlsdb;
+	GTlsInteraction *tls_interaction;
+	gboolean ssl_strict;
+
+	guint io_timeout;
+	guint idle_timeout;
+
+	/*< private >*/
+	guint ref_count;
+} SoupSocketProperties;
+
+GType soup_socket_properties_get_type (void);
+#define SOUP_TYPE_SOCKET_PROPERTIES (soup_socket_properties_get_type ())
+
+SoupSocketProperties *soup_socket_properties_new   (GProxyResolver     *proxy_resolver,
+			                            GInetSocketAddress *local_addr,
+						    GTlsDatabase       *tlsdb,
+						    GTlsInteraction    *tls_interaction,
+						    gboolean            ssl_strict,
+						    guint               io_timeout,
+						    guint               idle_timeout);
+
+SoupSocketProperties *soup_socket_properties_ref   (SoupSocketProperties *props);
+void                  soup_socket_properties_unref (SoupSocketProperties *props);
+
+#endif /* __SOUP_SOCKET_PROPERTIES_H__ */
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 9b471d39..86c2758e 100644
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -16,6 +16,7 @@
 
 #include "soup-socket.h"
 #include "soup-socket-private.h"
+#include "soup-socket-properties.h"
 #include "soup.h"
 #include "soup-filter-input-stream.h"
 #include "soup-io-stream.h"