Make SoupConnectionAuth private

9 files changed, 17 insertions, 18 deletions

diff --git a/libsoup/auth/soup-auth-basic.h b/libsoup/auth/soup-auth-basic.h
index 947c4b92..16383a7d 100644
--- a/libsoup/auth/soup-auth-basic.h
+++ b/libsoup/auth/soup-auth-basic.h
@@ -9,7 +9,6 @@
 
 G_BEGIN_DECLS
 
-#define SOUP_TYPE_AUTH_BASIC (soup_auth_basic_get_type ())
 SOUP_AVAILABLE_IN_2_4
 G_DECLARE_FINAL_TYPE (SoupAuthBasic, soup_auth_basic, SOUP, AUTH_BASIC, SoupAuth)
 
diff --git a/libsoup/auth/soup-auth-digest.h b/libsoup/auth/soup-auth-digest.h
index d6673de0..f434f6e4 100644
--- a/libsoup/auth/soup-auth-digest.h
+++ b/libsoup/auth/soup-auth-digest.h
@@ -7,6 +7,5 @@
 
 #include "soup-auth.h"
 
-#define SOUP_TYPE_AUTH_DIGEST (soup_auth_digest_get_type ())
 SOUP_AVAILABLE_IN_2_4
 G_DECLARE_FINAL_TYPE (SoupAuthDigest, soup_auth_digest, SOUP, AUTH_DIGEST, SoupAuth)
diff --git a/libsoup/auth/soup-auth-negotiate.h b/libsoup/auth/soup-auth-negotiate.h
index ffcda002..9c51b02e 100644
--- a/libsoup/auth/soup-auth-negotiate.h
+++ b/libsoup/auth/soup-auth-negotiate.h
@@ -10,7 +10,6 @@
 
 G_BEGIN_DECLS
 
-#define SOUP_TYPE_AUTH_NEGOTIATE (soup_auth_negotiate_get_type())
 SOUP_AVAILABLE_IN_2_54
 G_DECLARE_FINAL_TYPE (SoupAuthNegotiate, soup_auth_negotiate, SOUP, AUTH_NEGOTIATE, SoupConnectionAuth)
 
diff --git a/libsoup/auth/soup-auth-ntlm.h b/libsoup/auth/soup-auth-ntlm.h
index 1c022686..e7724c61 100644
--- a/libsoup/auth/soup-auth-ntlm.h
+++ b/libsoup/auth/soup-auth-ntlm.h
@@ -9,7 +9,6 @@
 
 G_BEGIN_DECLS
 
-#define SOUP_TYPE_AUTH_NTLM (soup_auth_ntlm_get_type ())
 SOUP_AVAILABLE_IN_2_4
 G_DECLARE_FINAL_TYPE (SoupAuthNTLM, soup_auth_ntlm, SOUP, AUTH_NTLM, SoupConnectionAuth)
 
diff --git a/libsoup/auth/soup-auth.h b/libsoup/auth/soup-auth.h
index 0773e25b..606127b5 100644
--- a/libsoup/auth/soup-auth.h
+++ b/libsoup/auth/soup-auth.h
@@ -97,4 +97,21 @@ void        soup_auth_free_protection_space (SoupAuth      *auth,
 SOUP_AVAILABLE_IN_2_54
 gboolean    soup_auth_negotiate_supported   (void);
 
+#define SOUP_TYPE_AUTH_BASIC (soup_auth_basic_get_type ())
+SOUP_AVAILABLE_IN_2_4
+GType soup_auth_basic_get_type (void);
+
+#define SOUP_TYPE_AUTH_DIGEST (soup_auth_digest_get_type ())
+SOUP_AVAILABLE_IN_2_4
+GType soup_auth_digest_get_type (void);
+
+#define SOUP_TYPE_AUTH_NTLM (soup_auth_ntlm_get_type ())
+SOUP_AVAILABLE_IN_2_4
+GType soup_auth_ntlm_get_type (void);
+
+#define SOUP_TYPE_AUTH_NEGOTIATE (soup_auth_negotiate_get_type ())
+SOUP_AVAILABLE_IN_2_54
+GType soup_auth_negotiate_get_type (void);
+
+
 G_END_DECLS
diff --git a/libsoup/auth/soup-connection-auth.h b/libsoup/auth/soup-connection-auth.h
index e741e116..ba85b1f8 100644
--- a/libsoup/auth/soup-connection-auth.h
+++ b/libsoup/auth/soup-connection-auth.h
@@ -10,7 +10,6 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_CONNECTION_AUTH (soup_connection_auth_get_type ())
-_SOUP_EXTERN
 G_DECLARE_DERIVABLE_TYPE (SoupConnectionAuth, soup_connection_auth, SOUP, CONNECTION_AUTH, SoupAuth)
 
 struct _SoupConnectionAuthClass {
diff --git a/libsoup/include/soup-installed.h b/libsoup/include/soup-installed.h
index 1abe966e..bf421809 100644
--- a/libsoup/include/soup-installed.h
+++ b/libsoup/include/soup-installed.h
@@ -13,14 +13,10 @@ extern "C" {
 #define __SOUP_H_INSIDE__
 
 #include <libsoup/soup-auth.h>
-#include <libsoup/soup-auth-basic.h>
-#include <libsoup/soup-auth-digest.h>
 #include <libsoup/soup-auth-domain.h>
 #include <libsoup/soup-auth-domain-basic.h>
 #include <libsoup/soup-auth-domain-digest.h>
 #include <libsoup/soup-auth-manager.h>
-#include <libsoup/soup-auth-negotiate.h>
-#include <libsoup/soup-auth-ntlm.h>
 #include <libsoup/soup-cache.h>
 #include <libsoup/soup-content-decoder.h>
 #include <libsoup/soup-content-sniffer.h>
diff --git a/libsoup/meson.build b/libsoup/meson.build
index e8bf6f43..e9756508 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -90,12 +90,7 @@ soup_private_enum_headers = [
 
 soup_introspection_headers = [
   'auth/soup-auth.h',
-  'auth/soup-auth-basic.h',
-  'auth/soup-auth-digest.h',
   'auth/soup-auth-manager.h',
-  'auth/soup-auth-negotiate.h',
-  'auth/soup-auth-ntlm.h',
-  'auth/soup-connection-auth.h', # FIXME: Keep private
 
   'cache/soup-cache.h',
 
diff --git a/libsoup/soup.h b/libsoup/soup.h
index c2b6c60b..52b5223e 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -13,11 +13,7 @@ extern "C" {
 #define __SOUP_H_INSIDE__
 
 #include "auth/soup-auth.h"
-#include "auth/soup-auth-basic.h"
-#include "auth/soup-auth-digest.h"
 #include "auth/soup-auth-manager.h"
-#include "auth/soup-auth-negotiate.h"
-#include "auth/soup-auth-ntlm.h"
 #include "cache/soup-cache.h"
 #include "content-sniffer/soup-content-decoder.h"
 #include "content-sniffer/soup-content-sniffer.h"