GNOME.org
 

[libsoup] SoupSessionFeature: Change to private interface

commit 4db217c7028b0468335a1ad1585ffc2cf1d4c4f1
Author: Patrick Griffis <pgriffis igalia com>
Date:   Tue Dec 1 15:55:57 2020 -0600

    SoupSessionFeature: Change to private interface

 docs/reference/libsoup-3.0-sections.txt            |  9 ----
 docs/reference/meson.build                         |  1 +
 libsoup/auth/soup-auth-digest.c                    |  1 +
 libsoup/auth/soup-auth-manager.c                   |  1 +
 libsoup/cache/soup-cache.c                         |  1 +
 libsoup/content-decoder/soup-content-decoder.c     |  2 +-
 libsoup/content-sniffer/soup-content-sniffer.c     |  3 +-
 libsoup/cookies/soup-cookie-jar.c                  |  1 +
 libsoup/hsts/soup-hsts-enforcer.c                  |  1 +
 libsoup/soup-logger.c                              |  1 +
 libsoup/soup-session-feature-private.h             | 50 ++++++++++++++++++++++
 libsoup/soup-session-feature.c                     |  2 +-
 libsoup/soup-session-feature.h                     | 47 --------------------
 libsoup/soup-session.c                             |  1 +
 .../websocket/soup-websocket-extension-manager.c   |  2 +-
 15 files changed, 63 insertions(+), 60 deletions(-)
---
diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt
index 01dff225..8c711f59 100644
--- a/docs/reference/libsoup-3.0-sections.txt
+++ b/docs/reference/libsoup-3.0-sections.txt
@@ -413,7 +413,6 @@ SOUP_SESSION_USE_NTLM
 <FILE>soup-session-feature</FILE>
 <TITLE>SoupSessionFeature</TITLE>
 SoupSessionFeature
-SoupSessionFeatureInterface
 <SUBSECTION Standard>
 soup_session_feature_get_type
 SOUP_SESSION_FEATURE
@@ -422,14 +421,6 @@ SOUP_SESSION_FEATURE_GET_CLASS
 SOUP_IS_SESSION_FEATURE
 SOUP_IS_SESSION_FEATURE_CLASS
 SOUP_TYPE_SESSION_FEATURE
-<SUBSECTION Private>
-soup_session_feature_attach
-soup_session_feature_detach
-soup_session_feature_request_queued
-soup_session_feature_request_unqueued
-soup_session_feature_add_feature
-soup_session_feature_has_feature
-soup_session_feature_remove_feature
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 36a064d4..cd0468ca 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -33,6 +33,7 @@ ignore_headers = [
   'soup-server-message-private.h',
   'soup-message-io-data.h',
   'soup-uri-utils-private.h',
+  'soup-session-feature-private.h',
 ]
 
 mkdb_args = [
diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
index 76922929..3a8e0b52 100644
--- a/libsoup/auth/soup-auth-digest.c
+++ b/libsoup/auth/soup-auth-digest.c
@@ -14,6 +14,7 @@
 #include "auth/soup-auth-digest-private.h"
 #include "soup.h"
 #include "soup-message-private.h"
+#include "soup-uri-utils-private.h"
 
 #ifdef G_OS_WIN32
 #include <process.h>
diff --git a/libsoup/auth/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c
index b20d73f0..1aa45e85 100644
--- a/libsoup/auth/soup-auth-manager.c
+++ b/libsoup/auth/soup-auth-manager.c
@@ -17,6 +17,7 @@
 #include "soup-message-private.h"
 #include "soup-path-map.h"
 #include "soup-session-private.h"
+#include "soup-session-feature-private.h"
 #include "soup-uri-utils-private.h"
 
 /**
diff --git a/libsoup/cache/soup-cache.c b/libsoup/cache/soup-cache.c
index c78c6224..050f48a8 100644
--- a/libsoup/cache/soup-cache.c
+++ b/libsoup/cache/soup-cache.c
@@ -43,6 +43,7 @@
 #include "soup-message-private.h"
 #include "soup-misc.h"
 #include "soup-session-private.h"
+#include "soup-session-feature-private.h"
 
 /**
  * SECTION:soup-cache
diff --git a/libsoup/content-decoder/soup-content-decoder.c b/libsoup/content-decoder/soup-content-decoder.c
index 5be8cc38..abbf7f0d 100644
--- a/libsoup/content-decoder/soup-content-decoder.c
+++ b/libsoup/content-decoder/soup-content-decoder.c
@@ -11,7 +11,7 @@
 
 #include "soup-content-decoder.h"
 #include "soup-converter-wrapper.h"
-#include "soup-session-feature.h"
+#include "soup-session-feature-private.h"
 #include "soup-message-private.h"
 #include "soup-headers.h"
 #ifdef WITH_BROTLI
diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
index 490dee6a..51fe3ba8 100644
--- a/libsoup/content-sniffer/soup-content-sniffer.c
+++ b/libsoup/content-sniffer/soup-content-sniffer.c
@@ -16,10 +16,11 @@
 #include <string.h>
 
 #include "soup-content-sniffer.h"
-#include "soup-session-feature.h"
+#include "soup-session-feature-private.h"
 #include "soup-content-processor.h"
 #include "soup-content-sniffer-stream.h"
 #include "soup-message-private.h"
+#include "soup-session-feature-private.h"
 
 /**
  * SECTION:soup-content-sniffer
diff --git a/libsoup/cookies/soup-cookie-jar.c b/libsoup/cookies/soup-cookie-jar.c
index 5231e548..0afdcb79 100644
--- a/libsoup/cookies/soup-cookie-jar.c
+++ b/libsoup/cookies/soup-cookie-jar.c
@@ -16,6 +16,7 @@
 #include "soup-message-private.h"
 #include "soup-misc.h"
 #include "soup.h"
+#include "soup-session-feature-private.h"
 #include "soup-uri-utils-private.h"
 
 /**
diff --git a/libsoup/hsts/soup-hsts-enforcer.c b/libsoup/hsts/soup-hsts-enforcer.c
index de3feba1..32cdd873 100644
--- a/libsoup/hsts/soup-hsts-enforcer.c
+++ b/libsoup/hsts/soup-hsts-enforcer.c
@@ -14,6 +14,7 @@
 #include "soup-misc.h"
 #include "soup.h"
 #include "soup-session-private.h"
+#include "soup-session-feature-private.h"
 #include "soup-uri-utils-private.h"
 
 /**
diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c
index 38d1627c..f82d73e4 100644
--- a/libsoup/soup-logger.c
+++ b/libsoup/soup-logger.c
@@ -19,6 +19,7 @@
 #include "soup-message-private.h"
 #include "soup-misc.h"
 #include "soup.h"
+#include "soup-session-feature-private.h"
 
 /**
  * SECTION:soup-logger
diff --git a/libsoup/soup-session-feature-private.h b/libsoup/soup-session-feature-private.h
new file mode 100644
index 00000000..643bd5b0
--- /dev/null
+++ b/libsoup/soup-session-feature-private.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008 Red Hat, Inc.
+ */
+
+#pragma once
+
+#include "soup-session-feature.h"
+
+G_BEGIN_DECLS
+
+struct _SoupSessionFeatureInterface {
+       GTypeInterface parent;
+
+       /* methods */
+       void     (*attach)           (SoupSessionFeature *feature,
+                                     SoupSession        *session);
+       void     (*detach)           (SoupSessionFeature *feature,
+                                     SoupSession        *session);
+
+       void     (*request_queued)   (SoupSessionFeature *feature,
+                                     SoupMessage        *msg);
+       void     (*request_unqueued) (SoupSessionFeature *feature,
+                                     SoupMessage        *msg);
+
+       gboolean (*add_feature)      (SoupSessionFeature *feature,
+                                     GType               type);
+       gboolean (*remove_feature)   (SoupSessionFeature *feature,
+                                     GType               type);
+       gboolean (*has_feature)      (SoupSessionFeature *feature,
+                                     GType               type);
+
+};
+
+void     soup_session_feature_attach         (SoupSessionFeature *feature,
+                                             SoupSession        *session);
+void     soup_session_feature_detach         (SoupSessionFeature *feature,
+                                             SoupSession        *session);
+void     soup_session_feature_request_queued (SoupSessionFeature *feature,
+                                             SoupMessage        *msg);
+void     soup_session_feature_request_unqueued (SoupSessionFeature *feature,
+                                               SoupMessage        *msg);
+gboolean soup_session_feature_add_feature    (SoupSessionFeature *feature,
+                                             GType               type);
+gboolean soup_session_feature_remove_feature (SoupSessionFeature *feature,
+                                             GType               type);
+gboolean soup_session_feature_has_feature    (SoupSessionFeature *feature,
+                                             GType               type);
+
+G_END_DECLS
diff --git a/libsoup/soup-session-feature.c b/libsoup/soup-session-feature.c
index 049dd75a..cd7884b3 100644
--- a/libsoup/soup-session-feature.c
+++ b/libsoup/soup-session-feature.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #endif
 
-#include "soup-session-feature.h"
+#include "soup-session-feature-private.h"
 #include "soup.h"
 #include "soup-message-private.h"
 
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index b603c2a0..21a5ef0e 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -13,51 +13,4 @@ G_BEGIN_DECLS
 SOUP_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE (SoupSessionFeature, soup_session_feature, SOUP, SESSION_FEATURE, GObject)
 
-struct _SoupSessionFeatureInterface {
-       GTypeInterface parent;
-
-       /* methods */
-       void     (*attach)           (SoupSessionFeature *feature,
-                                     SoupSession        *session);
-       void     (*detach)           (SoupSessionFeature *feature,
-                                     SoupSession        *session);
-
-       void     (*request_queued)   (SoupSessionFeature *feature,
-                                     SoupMessage        *msg);
-       void     (*request_unqueued) (SoupSessionFeature *feature,
-                                     SoupMessage        *msg);
-
-       gboolean (*add_feature)      (SoupSessionFeature *feature,
-                                     GType               type);
-       gboolean (*remove_feature)   (SoupSessionFeature *feature,
-                                     GType               type);
-       gboolean (*has_feature)      (SoupSessionFeature *feature,
-                                     GType               type);
-
-};
-
-SOUP_AVAILABLE_IN_ALL
-void     soup_session_feature_attach         (SoupSessionFeature *feature,
-                                             SoupSession        *session);
-SOUP_AVAILABLE_IN_ALL
-void     soup_session_feature_detach         (SoupSessionFeature *feature,
-                                             SoupSession        *session);
-
-SOUP_AVAILABLE_IN_ALL
-void     soup_session_feature_request_queued (SoupSessionFeature *feature,
-                                             SoupMessage        *msg);
-SOUP_AVAILABLE_IN_ALL
-void     soup_session_feature_request_unqueued (SoupSessionFeature *feature,
-                                               SoupMessage        *msg);
-
-SOUP_AVAILABLE_IN_ALL
-gboolean soup_session_feature_add_feature    (SoupSessionFeature *feature,
-                                             GType               type);
-SOUP_AVAILABLE_IN_ALL
-gboolean soup_session_feature_remove_feature (SoupSessionFeature *feature,
-                                             GType               type);
-SOUP_AVAILABLE_IN_ALL
-gboolean soup_session_feature_has_feature    (SoupSessionFeature *feature,
-                                             GType               type);
-
 G_END_DECLS
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index ac9a3411..c78df326 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -21,6 +21,7 @@
 #include "soup-misc.h"
 #include "soup-message-queue.h"
 #include "soup-session-private.h"
+#include "soup-session-feature-private.h"
 #include "soup-socket-properties.h"
 #include "soup-uri-utils-private.h"
 #include "websocket/soup-websocket.h"
diff --git a/libsoup/websocket/soup-websocket-extension-manager.c 
b/libsoup/websocket/soup-websocket-extension-manager.c
index f213d6d6..f2c26f9e 100644
--- a/libsoup/websocket/soup-websocket-extension-manager.c
+++ b/libsoup/websocket/soup-websocket-extension-manager.c
@@ -26,7 +26,7 @@
 
 #include "soup-websocket-extension-manager.h"
 #include "soup-headers.h"
-#include "soup-session-feature.h"
+#include "soup-session-feature-private.h"
 #include "soup-websocket.h"
 #include "soup-websocket-extension.h"
 #include "soup-websocket-extension-deflate.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]