Move RESPONSE_BLOCK_SIZE #define here from soup-private.h

	* libsoup/soup-message-io.c: Move RESPONSE_BLOCK_SIZE #define here
	from soup-private.h

	* libsoup/soup-misc.c (soup_load_config, etc): Remove all this.
	(soup_set_security_policy, soup_get_security_policy): Remove,
	since the GNUTLS backend doesn't actually implement it.
	(soup_set_ssl_ca_dir, soup_get_ssl_ca_dir): Likewise

	* libsoup/soup-misc.h: sync to soup-misc.c. Don't #include extra
	stuff.

	* libsoup/soup-types.h (SOUP_MAKE_TYPE): Move this here from
	soup-private.h

	* libsoup/soup-ssl.h: Merge soup_ssl_get_iochannel and
	soup_ssl_get_server_iochannel into a single function that takes a
	SoupSSLType.

	* libsoup/soup-gnutls.c: Remove soup_get_ssl_ca_dir() reference.
	(soup_ssl_get_iochannel): Renamed from soup_gnutls_get_iochannel.
	(soup_gnutls_set_security_policy): Gone

	* libsoup/soup-gnutls.h
	* libsoup/soup-ssl.c: Gone; soup-ssl.h is the #include file for
	soup-gnutls.c now

	* libsoup/soup-socket.c: Move soup_sockaddr_max
	#define here from soup-private.h
	(soup_socket_start_ssl): Update for new soup_ssl_get_iochannel
	prototype.

	* libsoup/soup-private.h: Gone

	* libsoup/soup-address.c: Fix #includes for soup-private.h and
	soup-misc.h changes
	* libsoup/soup-auth-digest.c: Likewise
	* libsoup/soup-auth.c: Likewise
	* libsoup/soup-connection-ntlm.c: Likewise
	* libsoup/soup-connection.c: Likewise
	* libsoup/soup-dns.c: Likewise
	* libsoup/soup-gnutls.c: Likewise
	* libsoup/soup-headers.c: Likewise
	* libsoup/soup-message-client-io.c: Likewise
	* libsoup/soup-message-handlers.c: Likewise
	* libsoup/soup-message-io.c: Likewise
	* libsoup/soup-message-server-io.c: Likewise
	* libsoup/soup-message.c: Likewise
	* libsoup/soup-server-message.c: Likewise
	* libsoup/soup-server.c: Likewise
	* libsoup/soup-session.c: Likewise
	* libsoup/soup-socket.c: Likewise
	* tests/auth-test.c: Likewise

1 files changed, 34 insertions, 55 deletions

diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index e67d409f..5855ddd5 100644
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -6,77 +6,56 @@
 #ifndef SOUP_MISC_H
 #define SOUP_MISC_H 1
 
-#include <glib.h>
-#include <libsoup/soup-message.h>
-#include <libsoup/soup-uri.h>
-
-/* Configuration routines */
-
-void               soup_load_config          (gchar       *config_file);
-
-typedef enum {
-	SOUP_SECURITY_DOMESTIC = 1,
-	SOUP_SECURITY_EXPORT   = 2,
-	SOUP_SECURITY_FRANCE   = 3
-} SoupSecurityPolicy;
-
-void               soup_set_security_policy  (SoupSecurityPolicy policy);
-
-SoupSecurityPolicy soup_get_security_policy  (void);
+#include <glib-object.h>
 
 /* SSL setup routines */
 
-void               soup_set_ssl_ca_file      (const gchar *ca_file);
-
-void               soup_set_ssl_ca_dir       (const gchar *ca_dir);
+void               soup_set_ssl_ca_file      (const char   *ca_file);
 
-void               soup_set_ssl_cert_files   (const gchar *cert_file, 
-					      const gchar *key_file);
+void               soup_set_ssl_cert_files   (const char   *cert_file, 
+					      const char   *key_file);
 
 const char        *soup_get_ssl_ca_file      (void);
-const char        *soup_get_ssl_ca_dir       (void);
-void               soup_get_ssl_cert_files   (const gchar **cert_file,
-					      const gchar **key_file);
+void               soup_get_ssl_cert_files   (const char  **cert_file,
+					      const char  **key_file);
 
 /* Base64 encoding/decoding */
 
-gchar             *soup_base64_encode          (const gchar    *text,
-						gint            len);
+char              *soup_base64_encode        (const char   *text,
+					      int           len);
 
-int                soup_base64_encode_close    (const guchar   *in, 
-						int             inlen, 
-						gboolean        break_lines, 
-						guchar         *out, 
-						int            *state, 
-						int            *save);
+int                soup_base64_encode_close  (const guchar *in, 
+					      int           inlen, 
+					      gboolean      break_lines, 
+					      guchar       *out, 
+					      int          *state, 
+					      int          *save);
 
-int                soup_base64_encode_step     (const guchar   *in, 
-						int             len, 
-						gboolean        break_lines, 
-						guchar         *out, 
-						int            *state, 
-						int            *save);
+int                soup_base64_encode_step   (const guchar *in, 
+					      int           len, 
+					      gboolean      break_lines, 
+					      guchar       *out, 
+					      int          *state, 
+					      int          *save);
 
-gchar             *soup_base64_decode          (const gchar    *text,
-						gint           *out_len);
+char              *soup_base64_decode        (const gchar  *text,
+					      int          *out_len);
 
-int                soup_base64_decode_step     (const guchar   *in, 
-						int             len, 
-						guchar         *out, 
-						int            *state, 
-						guint          *save);
+int                soup_base64_decode_step   (const guchar *in, 
+					      int           len, 
+					      guchar       *out, 
+					      int          *state, 
+					      guint        *save);
 
 /* Misc utils */
 
-guint              soup_signal_connect_once   (gpointer         instance,
-					       const char *     signal,
-					       GCallback        c_handler,
-					       gpointer         data);
-
-/* Useful debugging routines */
-
-void               soup_debug_print_headers  (SoupMessage *req);
+guint              soup_signal_connect_once  (gpointer      instance,
+					      const char   *signal,
+					      GCallback     c_handler,
+					      gpointer      data);
 
-void               soup_debug_print_uri      (SoupUri     *uri);
+guint              soup_str_case_hash        (gconstpointer key);
+gboolean           soup_str_case_equal       (gconstpointer v1,
+					      gconstpointer v2);
 
 #endif /* SOUP_MISC_H */