Use G_DECLARE_FINAL_TYPE when applicable

33 files changed, 87 insertions, 87 deletions

diff --git a/libsoup/auth/soup-auth-basic.c b/libsoup/auth/soup-auth-basic.c
index 9045534d..7a35362c 100644
--- a/libsoup/auth/soup-auth-basic.c
+++ b/libsoup/auth/soup-auth-basic.c
@@ -32,7 +32,7 @@ typedef struct {
  *
  */
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthBasic, soup_auth_basic, SOUP_TYPE_AUTH)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthBasic, soup_auth_basic, SOUP_TYPE_AUTH)
 
 static void
 soup_auth_basic_init (SoupAuthBasic *basic)
diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
index 05c2ce12..eab0f377 100644
--- a/libsoup/auth/soup-auth-digest.c
+++ b/libsoup/auth/soup-auth-digest.c
@@ -55,7 +55,7 @@ static void recompute_hex_a1 (SoupAuthDigestPrivate *priv);
  *
  */
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthDigest, soup_auth_digest, SOUP_TYPE_AUTH)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthDigest, soup_auth_digest, SOUP_TYPE_AUTH)
 
 static void
 soup_auth_digest_init (SoupAuthDigest *digest)
diff --git a/libsoup/auth/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c
index 266f88c5..015c7c74 100644
--- a/libsoup/auth/soup-auth-manager.c
+++ b/libsoup/auth/soup-auth-manager.c
@@ -84,10 +84,10 @@ typedef struct {
 	GHashTable  *auths;            /* scheme:realm -> SoupAuth */
 } SoupAuthHost;
 
-G_DEFINE_TYPE_WITH_CODE (SoupAuthManager, soup_auth_manager, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupAuthManager)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-						soup_auth_manager_session_feature_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupAuthManager, soup_auth_manager, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupAuthManager)
+			       G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
+						      soup_auth_manager_session_feature_init))
 
 static void soup_auth_host_free (SoupAuthHost *host);
 static SoupAuth *record_auth_for_uri (SoupAuthManagerPrivate *priv,
diff --git a/libsoup/auth/soup-auth-negotiate.c b/libsoup/auth/soup-auth-negotiate.c
index 11672973..a5624a3d 100644
--- a/libsoup/auth/soup-auth-negotiate.c
+++ b/libsoup/auth/soup-auth-negotiate.c
@@ -88,7 +88,7 @@ typedef struct {
  * was.
  *
  */
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthNegotiate, soup_auth_negotiate, SOUP_TYPE_CONNECTION_AUTH)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthNegotiate, soup_auth_negotiate, SOUP_TYPE_CONNECTION_AUTH)
 
 #ifdef LIBSOUP_HAVE_GSSAPI
 static gboolean check_auth_trusted_uri (SoupConnectionAuth *auth,
diff --git a/libsoup/auth/soup-auth-ntlm.c b/libsoup/auth/soup-auth-ntlm.c
index 61c4a38a..0a0ed0ed 100644
--- a/libsoup/auth/soup-auth-ntlm.c
+++ b/libsoup/auth/soup-auth-ntlm.c
@@ -108,7 +108,7 @@ static void sso_ntlm_close (SoupAuthNTLMPrivate *priv);
  *
  */
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthNTLM, soup_auth_ntlm, SOUP_TYPE_CONNECTION_AUTH)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthNTLM, soup_auth_ntlm, SOUP_TYPE_CONNECTION_AUTH)
 
 static void
 soup_auth_ntlm_init (SoupAuthNTLM *ntlm)
diff --git a/libsoup/auth/soup-tls-interaction.c b/libsoup/auth/soup-tls-interaction.c
index d79289d4..1f683d88 100644
--- a/libsoup/auth/soup-tls-interaction.c
+++ b/libsoup/auth/soup-tls-interaction.c
@@ -19,7 +19,7 @@ typedef struct {
         SoupConnection *conn;
 } SoupTlsInteractionPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupTlsInteraction, soup_tls_interaction, G_TYPE_TLS_INTERACTION)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupTlsInteraction, soup_tls_interaction, G_TYPE_TLS_INTERACTION)
 
 static void
 soup_tls_interaction_request_certificate_async (GTlsInteraction             *tls_interaction,
diff --git a/libsoup/cache/soup-cache-client-input-stream.c b/libsoup/cache/soup-cache-client-input-stream.c
index b03e47b3..8aaf8cc2 100644
--- a/libsoup/cache/soup-cache-client-input-stream.c
+++ b/libsoup/cache/soup-cache-client-input-stream.c
@@ -25,7 +25,7 @@ struct _SoupCacheClientInputStream {
 	GFilterInputStream parent_instance;
 };
 
-G_DEFINE_TYPE (SoupCacheClientInputStream, soup_cache_client_input_stream, G_TYPE_FILTER_INPUT_STREAM)
+G_DEFINE_FINAL_TYPE (SoupCacheClientInputStream, soup_cache_client_input_stream, G_TYPE_FILTER_INPUT_STREAM)
 
 static void
 soup_cache_client_input_stream_init (SoupCacheClientInputStream *stream)
diff --git a/libsoup/cache/soup-cache-input-stream.c b/libsoup/cache/soup-cache-input-stream.c
index 390f54a0..30b0c55a 100644
--- a/libsoup/cache/soup-cache-input-stream.c
+++ b/libsoup/cache/soup-cache-input-stream.c
@@ -35,10 +35,10 @@ typedef struct {
 
 static void soup_cache_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupCacheInputStream, soup_cache_input_stream, SOUP_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupCacheInputStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-						soup_cache_input_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupCacheInputStream, soup_cache_input_stream, SOUP_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupCacheInputStream)
+                               G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+                                                      soup_cache_input_stream_pollable_init))
 
 
 static void soup_cache_input_stream_write_next_buffer (SoupCacheInputStream *istream);
diff --git a/libsoup/content-decoder/soup-brotli-decompressor.c b/libsoup/content-decoder/soup-brotli-decompressor.c
index 4c089477..95390bf5 100644
--- a/libsoup/content-decoder/soup-brotli-decompressor.c
+++ b/libsoup/content-decoder/soup-brotli-decompressor.c
@@ -36,8 +36,8 @@ struct _SoupBrotliDecompressor
 
 static void soup_brotli_decompressor_iface_init (GConverterIface *iface);
 
-G_DEFINE_TYPE_EXTENDED (SoupBrotliDecompressor, soup_brotli_decompressor, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER, soup_brotli_decompressor_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupBrotliDecompressor, soup_brotli_decompressor, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER, soup_brotli_decompressor_iface_init))
 
 SoupBrotliDecompressor *
 soup_brotli_decompressor_new (void)
diff --git a/libsoup/content-decoder/soup-content-decoder.c b/libsoup/content-decoder/soup-content-decoder.c
index 81dca039..5be17c6e 100644
--- a/libsoup/content-decoder/soup-content-decoder.c
+++ b/libsoup/content-decoder/soup-content-decoder.c
@@ -71,12 +71,12 @@ static SoupContentProcessorInterface *soup_content_decoder_default_content_proce
 static void soup_content_decoder_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data);
 
 
-G_DEFINE_TYPE_WITH_CODE (SoupContentDecoder, soup_content_decoder, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupContentDecoder)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-						soup_content_decoder_session_feature_init)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
-						soup_content_decoder_content_processor_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupContentDecoder, soup_content_decoder, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupContentDecoder)
+			       G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
+						      soup_content_decoder_session_feature_init)
+			       G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
+						      soup_content_decoder_content_processor_init))
 
 static GSList *
 soup_content_decoder_get_decoders_for_msg (SoupContentDecoder *decoder, SoupMessage *msg)
diff --git a/libsoup/content-decoder/soup-converter-wrapper.c b/libsoup/content-decoder/soup-converter-wrapper.c
index 9b0bf160..4086d4f3 100644
--- a/libsoup/content-decoder/soup-converter-wrapper.c
+++ b/libsoup/content-decoder/soup-converter-wrapper.c
@@ -51,10 +51,10 @@ typedef struct {
 
 static void soup_converter_wrapper_iface_init (GConverterIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (SoupConverterWrapper, soup_converter_wrapper, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupConverterWrapper)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER,
-						soup_converter_wrapper_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupConverterWrapper, soup_converter_wrapper, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupConverterWrapper)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER,
+                                                      soup_converter_wrapper_iface_init))
 
 static void
 soup_converter_wrapper_init (SoupConverterWrapper *converter)
diff --git a/libsoup/content-sniffer/soup-content-sniffer-stream.c b/libsoup/content-sniffer/soup-content-sniffer-stream.c
index 30a7b372..d0b3750a 100644
--- a/libsoup/content-sniffer/soup-content-sniffer-stream.c
+++ b/libsoup/content-sniffer/soup-content-sniffer-stream.c
@@ -46,10 +46,10 @@ typedef struct {
 
 static void soup_content_sniffer_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupContentSnifferStream, soup_content_sniffer_stream, G_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupContentSnifferStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-						soup_content_sniffer_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupContentSnifferStream, soup_content_sniffer_stream, G_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupContentSnifferStream)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+						      soup_content_sniffer_stream_pollable_init))
 
 static void
 soup_content_sniffer_stream_finalize (GObject *object)
diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
index 50a636bc..7721b8c2 100644
--- a/libsoup/content-sniffer/soup-content-sniffer.c
+++ b/libsoup/content-sniffer/soup-content-sniffer.c
@@ -51,11 +51,11 @@ struct _SoupContentSniffer {
         GObject parent_instance;
 };
 
-G_DEFINE_TYPE_WITH_CODE (SoupContentSniffer, soup_content_sniffer, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-						soup_content_sniffer_session_feature_init)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
-						soup_content_sniffer_content_processor_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupContentSniffer, soup_content_sniffer, G_TYPE_OBJECT,
+			       G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
+						      soup_content_sniffer_session_feature_init)
+			       G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
+						      soup_content_sniffer_content_processor_init))
 
 
 static GInputStream *
diff --git a/libsoup/cookies/soup-cookie-jar-db.c b/libsoup/cookies/soup-cookie-jar-db.c
index cddce635..91fa15d3 100644
--- a/libsoup/cookies/soup-cookie-jar-db.c
+++ b/libsoup/cookies/soup-cookie-jar-db.c
@@ -56,7 +56,7 @@ typedef struct {
 	sqlite3 *db;
 } SoupCookieJarDBPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupCookieJarDB, soup_cookie_jar_db, SOUP_TYPE_COOKIE_JAR)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupCookieJarDB, soup_cookie_jar_db, SOUP_TYPE_COOKIE_JAR)
 
 static void load (SoupCookieJar *jar);
 
diff --git a/libsoup/cookies/soup-cookie-jar-text.c b/libsoup/cookies/soup-cookie-jar-text.c
index 25625529..ab882ea8 100644
--- a/libsoup/cookies/soup-cookie-jar-text.c
+++ b/libsoup/cookies/soup-cookie-jar-text.c
@@ -51,7 +51,7 @@ typedef struct {
 
 } SoupCookieJarTextPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupCookieJarText, soup_cookie_jar_text, SOUP_TYPE_COOKIE_JAR)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupCookieJarText, soup_cookie_jar_text, SOUP_TYPE_COOKIE_JAR)
 
 static void load (SoupCookieJar *jar);
 
diff --git a/libsoup/hsts/soup-hsts-enforcer-db.c b/libsoup/hsts/soup-hsts-enforcer-db.c
index 2a63df5b..9c8ff1be 100644
--- a/libsoup/hsts/soup-hsts-enforcer-db.c
+++ b/libsoup/hsts/soup-hsts-enforcer-db.c
@@ -51,8 +51,8 @@ typedef struct {
 	sqlite3 *db;
 } SoupHSTSEnforcerDBPrivate;
 
-G_DEFINE_TYPE_WITH_CODE (SoupHSTSEnforcerDB, soup_hsts_enforcer_db, SOUP_TYPE_HSTS_ENFORCER,
-			 G_ADD_PRIVATE(SoupHSTSEnforcerDB))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupHSTSEnforcerDB, soup_hsts_enforcer_db, SOUP_TYPE_HSTS_ENFORCER,
+			       G_ADD_PRIVATE(SoupHSTSEnforcerDB))
 
 static void load (SoupHSTSEnforcer *hsts_enforcer);
 
diff --git a/libsoup/http1/soup-body-input-stream.c b/libsoup/http1/soup-body-input-stream.c
index 56363b5b..28acae83 100644
--- a/libsoup/http1/soup-body-input-stream.c
+++ b/libsoup/http1/soup-body-input-stream.c
@@ -61,12 +61,12 @@ static GParamSpec *properties[LAST_PROPERTY] = { NULL, };
 static void soup_body_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 static void soup_body_input_stream_seekable_init (GSeekableIface *seekable_interface);
 
-G_DEFINE_TYPE_WITH_CODE (SoupBodyInputStream, soup_body_input_stream, G_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupBodyInputStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-						soup_body_input_stream_pollable_init)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
-						soup_body_input_stream_seekable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupBodyInputStream, soup_body_input_stream, G_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupBodyInputStream)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+						      soup_body_input_stream_pollable_init)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
+						      soup_body_input_stream_seekable_init))
 
 static void
 soup_body_input_stream_init (SoupBodyInputStream *bistream)
diff --git a/libsoup/http1/soup-body-output-stream.c b/libsoup/http1/soup-body-output-stream.c
index 464f2d97..6f5c7806 100644
--- a/libsoup/http1/soup-body-output-stream.c
+++ b/libsoup/http1/soup-body-output-stream.c
@@ -58,10 +58,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 static void soup_body_output_stream_pollable_init (GPollableOutputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupBodyOutputStream, soup_body_output_stream, G_TYPE_FILTER_OUTPUT_STREAM,
-                         G_ADD_PRIVATE (SoupBodyOutputStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM,
-						soup_body_output_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupBodyOutputStream, soup_body_output_stream, G_TYPE_FILTER_OUTPUT_STREAM,
+                               G_ADD_PRIVATE (SoupBodyOutputStream)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM,
+						      soup_body_output_stream_pollable_init))
 
 
 static void
diff --git a/libsoup/http2/soup-body-input-stream-http2.c b/libsoup/http2/soup-body-input-stream-http2.c
index 82f14ee5..c543da66 100644
--- a/libsoup/http2/soup-body-input-stream-http2.c
+++ b/libsoup/http2/soup-body-input-stream-http2.c
@@ -52,10 +52,10 @@ typedef struct {
 
 static void soup_body_input_stream_http2_pollable_iface_init (GPollableInputStreamInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (SoupBodyInputStreamHttp2, soup_body_input_stream_http2, G_TYPE_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupBodyInputStreamHttp2)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-                                                soup_body_input_stream_http2_pollable_iface_init);)
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupBodyInputStreamHttp2, soup_body_input_stream_http2, G_TYPE_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupBodyInputStreamHttp2)
+                               G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+                                                      soup_body_input_stream_http2_pollable_iface_init);)
 
 enum {
         NEED_MORE_DATA,
diff --git a/libsoup/server/soup-auth-domain-basic.c b/libsoup/server/soup-auth-domain-basic.c
index 3390bc63..5e9f49c1 100644
--- a/libsoup/server/soup-auth-domain-basic.c
+++ b/libsoup/server/soup-auth-domain-basic.c
@@ -50,7 +50,7 @@ typedef struct {
 	GDestroyNotify auth_dnotify;
 } SoupAuthDomainBasicPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthDomainBasic, soup_auth_domain_basic, SOUP_TYPE_AUTH_DOMAIN)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthDomainBasic, soup_auth_domain_basic, SOUP_TYPE_AUTH_DOMAIN)
 
 static void
 soup_auth_domain_basic_init (SoupAuthDomainBasic *basic)
diff --git a/libsoup/server/soup-auth-domain-digest.c b/libsoup/server/soup-auth-domain-digest.c
index 5b0bf110..7968b3b7 100644
--- a/libsoup/server/soup-auth-domain-digest.c
+++ b/libsoup/server/soup-auth-domain-digest.c
@@ -54,7 +54,7 @@ typedef struct {
 
 } SoupAuthDomainDigestPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP_TYPE_AUTH_DOMAIN)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP_TYPE_AUTH_DOMAIN)
 
 static void
 soup_auth_domain_digest_init (SoupAuthDomainDigest *digest)
diff --git a/libsoup/server/soup-server-message.c b/libsoup/server/soup-server-message.c
index 0aecd057..d2a33164 100644
--- a/libsoup/server/soup-server-message.c
+++ b/libsoup/server/soup-server-message.c
@@ -78,7 +78,7 @@ struct _SoupServerMessageClass {
         GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (SoupServerMessage, soup_server_message, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (SoupServerMessage, soup_server_message, G_TYPE_OBJECT)
 
 enum {
         WROTE_INFORMATIONAL,
diff --git a/libsoup/server/soup-socket.c b/libsoup/server/soup-socket.c
index aa9815ee..2a7c2c50 100644
--- a/libsoup/server/soup-socket.c
+++ b/libsoup/server/soup-socket.c
@@ -79,10 +79,10 @@ typedef struct {
 
 static void soup_socket_initable_interface_init (GInitableIface *initable_interface);
 
-G_DEFINE_TYPE_WITH_CODE (SoupSocket, soup_socket, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupSocket)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-						soup_socket_initable_interface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupSocket, soup_socket, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupSocket)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+						      soup_socket_initable_interface_init))
 
 static void finish_socket_setup (SoupSocket *sock);
 static void finish_listener_setup (SoupSocket *sock);
diff --git a/libsoup/soup-client-input-stream.c b/libsoup/soup-client-input-stream.c
index 1be2485b..217c822d 100644
--- a/libsoup/soup-client-input-stream.c
+++ b/libsoup/soup-client-input-stream.c
@@ -44,10 +44,10 @@ static GParamSpec *properties[LAST_PROPERTY] = { NULL, };
 static GPollableInputStreamInterface *soup_client_input_stream_parent_pollable_interface;
 static void soup_client_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupClientInputStream, soup_client_input_stream, SOUP_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupClientInputStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-						soup_client_input_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupClientInputStream, soup_client_input_stream, SOUP_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupClientInputStream)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+						      soup_client_input_stream_pollable_init))
 
 static void
 soup_client_input_stream_init (SoupClientInputStream *stream)
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index df2e1768..f2e35f47 100644
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -49,7 +49,7 @@ typedef struct {
 	GCancellable *cancellable;
 } SoupConnectionPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupConnection, soup_connection, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupConnection, soup_connection, G_TYPE_OBJECT)
 
 enum {
 	EVENT,
diff --git a/libsoup/soup-io-stream.c b/libsoup/soup-io-stream.c
index 36ceb6d9..afd064b6 100644
--- a/libsoup/soup-io-stream.c
+++ b/libsoup/soup-io-stream.c
@@ -37,7 +37,7 @@ enum {
 
 static GParamSpec *properties[LAST_PROPERTY] = { NULL, };
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupIOStream, soup_io_stream, G_TYPE_IO_STREAM)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupIOStream, soup_io_stream, G_TYPE_IO_STREAM)
 
 static void
 soup_io_stream_init (SoupIOStream *stream)
diff --git a/libsoup/soup-logger-input-stream.c b/libsoup/soup-logger-input-stream.c
index bbc5f8ce..b1e8636b 100644
--- a/libsoup/soup-logger-input-stream.c
+++ b/libsoup/soup-logger-input-stream.c
@@ -36,10 +36,10 @@ typedef struct {
 
 static void soup_logger_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupLoggerInputStream, soup_logger_input_stream, G_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupLoggerInputStream)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-                                                soup_logger_input_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupLoggerInputStream, soup_logger_input_stream, G_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupLoggerInputStream)
+                               G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+                                                      soup_logger_input_stream_pollable_init))
 
 static void
 soup_logger_input_stream_init (SoupLoggerInputStream *logger)
diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c
index 933b7b73..944676e7 100644
--- a/libsoup/soup-logger.c
+++ b/libsoup/soup-logger.c
@@ -139,12 +139,12 @@ static void soup_logger_session_feature_init (SoupSessionFeatureInterface *featu
 static SoupContentProcessorInterface *soup_logger_default_content_processor_interface;
 static void soup_logger_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupLogger, soup_logger, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupLogger)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-						soup_logger_session_feature_init)
-			 G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
-						soup_logger_content_processor_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupLogger, soup_logger, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupLogger)
+                               G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
+                                                      soup_logger_session_feature_init)
+                               G_IMPLEMENT_INTERFACE (SOUP_TYPE_CONTENT_PROCESSOR,
+                                                      soup_logger_content_processor_init))
 
 static void
 write_body (SoupLogger *logger, const char *buffer, gsize nread,
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 2b9cbdb5..25984ef0 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -111,7 +111,7 @@ typedef struct {
         SoupMessageMetrics *metrics;
 } SoupMessagePrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupMessage, soup_message, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupMessage, soup_message, G_TYPE_OBJECT)
 
 enum {
 	WROTE_HEADERS,
diff --git a/libsoup/soup-multipart-input-stream.c b/libsoup/soup-multipart-input-stream.c
index c50dd715..f3c33849 100644
--- a/libsoup/soup-multipart-input-stream.c
+++ b/libsoup/soup-multipart-input-stream.c
@@ -74,10 +74,10 @@ typedef struct {
 
 static void soup_multipart_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data);
 
-G_DEFINE_TYPE_WITH_CODE (SoupMultipartInputStream, soup_multipart_input_stream, G_TYPE_FILTER_INPUT_STREAM,
-                         G_ADD_PRIVATE (SoupMultipartInputStream)
-			 G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
-						soup_multipart_input_stream_pollable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupMultipartInputStream, soup_multipart_input_stream, G_TYPE_FILTER_INPUT_STREAM,
+                               G_ADD_PRIVATE (SoupMultipartInputStream)
+			       G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
+						      soup_multipart_input_stream_pollable_init))
 
 static void
 soup_multipart_input_stream_dispose (GObject *object)
diff --git a/libsoup/websocket/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c
index 5fc933ef..a5511eab 100644
--- a/libsoup/websocket/soup-websocket-connection.c
+++ b/libsoup/websocket/soup-websocket-connection.c
@@ -159,7 +159,7 @@ typedef struct {
 #define READ_BUFFER_SIZE 1024
 #define MASK_LENGTH 4
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupWebsocketConnection, soup_websocket_connection, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupWebsocketConnection, soup_websocket_connection, G_TYPE_OBJECT)
 
 static void queue_frame (SoupWebsocketConnection *self, SoupWebsocketQueueFlags flags,
 			 gpointer data, gsize len, gsize amount);
diff --git a/libsoup/websocket/soup-websocket-extension-deflate.c b/libsoup/websocket/soup-websocket-extension-deflate.c
index c05022bb..c013892b 100644
--- a/libsoup/websocket/soup-websocket-extension-deflate.c
+++ b/libsoup/websocket/soup-websocket-extension-deflate.c
@@ -84,7 +84,7 @@ typedef struct {
  *
  */
 
-G_DEFINE_TYPE_WITH_PRIVATE (SoupWebsocketExtensionDeflate, soup_websocket_extension_deflate, SOUP_TYPE_WEBSOCKET_EXTENSION)
+G_DEFINE_FINAL_TYPE_WITH_PRIVATE (SoupWebsocketExtensionDeflate, soup_websocket_extension_deflate, SOUP_TYPE_WEBSOCKET_EXTENSION)
 
 static void
 soup_websocket_extension_deflate_init (SoupWebsocketExtensionDeflate *basic)
diff --git a/libsoup/websocket/soup-websocket-extension-manager.c b/libsoup/websocket/soup-websocket-extension-manager.c
index 0e471da7..77b07cc2 100644
--- a/libsoup/websocket/soup-websocket-extension-manager.c
+++ b/libsoup/websocket/soup-websocket-extension-manager.c
@@ -65,10 +65,10 @@ typedef struct {
         GPtrArray *extension_types;
 } SoupWebsocketExtensionManagerPrivate;
 
-G_DEFINE_TYPE_WITH_CODE (SoupWebsocketExtensionManager, soup_websocket_extension_manager, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (SoupWebsocketExtensionManager)
-                         G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-                                                soup_websocket_extension_manager_session_feature_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (SoupWebsocketExtensionManager, soup_websocket_extension_manager, G_TYPE_OBJECT,
+                               G_ADD_PRIVATE (SoupWebsocketExtensionManager)
+                               G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
+                                                      soup_websocket_extension_manager_session_feature_init))
 
 static void
 soup_websocket_extension_manager_init (SoupWebsocketExtensionManager *manager)