Move content-decoder sources to its own directory

14 files changed, 13 insertions, 10 deletions

diff --git a/libsoup/cache/soup-cache.c b/libsoup/cache/soup-cache.c
index 12a3f593..e97d822e 100644
--- a/libsoup/cache/soup-cache.c
+++ b/libsoup/cache/soup-cache.c
@@ -37,7 +37,7 @@
 #include "soup-cache-client-input-stream.h"
 #include "soup-cache-input-stream.h"
 #include "soup-cache-private.h"
-#include "content-sniffer/soup-content-processor.h"
+#include "soup-content-processor.h"
 #include "soup-message-private.h"
 #include "soup.h"
 #include "soup-message-private.h"
diff --git a/libsoup/content-sniffer/soup-brotli-decompressor.c b/libsoup/content-decoder/soup-brotli-decompressor.c
index 4c089477..4c089477 100644
--- a/libsoup/content-sniffer/soup-brotli-decompressor.c
+++ b/libsoup/content-decoder/soup-brotli-decompressor.c
diff --git a/libsoup/content-sniffer/soup-brotli-decompressor.h b/libsoup/content-decoder/soup-brotli-decompressor.h
index 5c99155f..5c99155f 100644
--- a/libsoup/content-sniffer/soup-brotli-decompressor.h
+++ b/libsoup/content-decoder/soup-brotli-decompressor.h
diff --git a/libsoup/content-sniffer/soup-content-decoder.c b/libsoup/content-decoder/soup-content-decoder.c
index 5be8cc38..5be8cc38 100644
--- a/libsoup/content-sniffer/soup-content-decoder.c
+++ b/libsoup/content-decoder/soup-content-decoder.c
diff --git a/libsoup/content-sniffer/soup-content-decoder.h b/libsoup/content-decoder/soup-content-decoder.h
index f31c4055..f31c4055 100644
--- a/libsoup/content-sniffer/soup-content-decoder.h
+++ b/libsoup/content-decoder/soup-content-decoder.h
diff --git a/libsoup/content-sniffer/soup-content-processor.c b/libsoup/content-decoder/soup-content-processor.c
index da9ad89e..da9ad89e 100644
--- a/libsoup/content-sniffer/soup-content-processor.c
+++ b/libsoup/content-decoder/soup-content-processor.c
diff --git a/libsoup/content-sniffer/soup-content-processor.h b/libsoup/content-decoder/soup-content-processor.h
index 39075412..39075412 100644
--- a/libsoup/content-sniffer/soup-content-processor.h
+++ b/libsoup/content-decoder/soup-content-processor.h
diff --git a/libsoup/content-sniffer/soup-converter-wrapper.c b/libsoup/content-decoder/soup-converter-wrapper.c
index f669ee55..f669ee55 100644
--- a/libsoup/content-sniffer/soup-converter-wrapper.c
+++ b/libsoup/content-decoder/soup-converter-wrapper.c
diff --git a/libsoup/content-sniffer/soup-converter-wrapper.h b/libsoup/content-decoder/soup-converter-wrapper.h
index c1b6f627..c1b6f627 100644
--- a/libsoup/content-sniffer/soup-converter-wrapper.h
+++ b/libsoup/content-decoder/soup-converter-wrapper.h
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 001feae1..531ff87b 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -16,11 +16,12 @@ soup_sources = [
   'cache/soup-cache-client-input-stream.c',
   'cache/soup-cache-input-stream.c',
 
-  'content-sniffer/soup-content-decoder.c',
-  'content-sniffer/soup-content-processor.c',
+  'content-decoder/soup-content-decoder.c',
+  'content-decoder/soup-content-processor.c',
+  'content-decoder/soup-converter-wrapper.c',
+
   'content-sniffer/soup-content-sniffer.c',
   'content-sniffer/soup-content-sniffer-stream.c',
-  'content-sniffer/soup-converter-wrapper.c',
 
   'cookies/soup-cookie.c',
   'cookies/soup-cookie-jar.c',
@@ -86,7 +87,8 @@ soup_introspection_headers = [
 
   'cache/soup-cache.h',
 
-  'content-sniffer/soup-content-decoder.h',
+  'content-decoder/soup-content-decoder.h',
+
   'content-sniffer/soup-content-sniffer.h',
 
   'cookies/soup-cookie.h',
@@ -131,7 +133,7 @@ soup_introspection_headers = [
 soup_installed_headers = soup_introspection_headers
 
 if brotlidec_dep.found()
-  soup_sources += 'content-sniffer/soup-brotli-decompressor.c'
+  soup_sources += 'content-decoder/soup-brotli-decompressor.c'
 endif
 
 
@@ -180,6 +182,7 @@ libsoup_includes = [
   include_directories([
     'auth',
     'cookies',
+    'content-decoder',
     'hsts',
     'server',
     'websocket',
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index 5df73063..997d0306 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -20,7 +20,7 @@
 #include "soup-body-output-stream.h"
 #include "soup-client-input-stream.h"
 #include "soup-connection.h"
-#include "content-sniffer/soup-content-processor.h"
+#include "soup-content-processor.h"
 #include "content-sniffer/soup-content-sniffer-stream.h"
 #include "soup-filter-input-stream.h"
 #include "soup-message-private.h"
diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index 8e5c160b..7d69f347 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -10,7 +10,7 @@
 #include "soup-message.h"
 #include "soup-message-io-data.h"
 #include "auth/soup-auth.h"
-#include "content-sniffer/soup-content-processor.h"
+#include "soup-content-processor.h"
 #include "content-sniffer/soup-content-sniffer.h"
 #include "soup-session.h"
 
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 52b5223e..9e7c863a 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -15,7 +15,7 @@ extern "C" {
 #include "auth/soup-auth.h"
 #include "auth/soup-auth-manager.h"
 #include "cache/soup-cache.h"
-#include "content-sniffer/soup-content-decoder.h"
+#include "content-decoder/soup-content-decoder.h"
 #include "content-sniffer/soup-content-sniffer.h"
 #include "cookies/soup-cookie.h"
 #include "cookies/soup-cookie-jar.h"
diff --git a/tests/brotli-decompressor-test.c b/tests/brotli-decompressor-test.c
index 4a8082d0..cb26e46a 100644
--- a/tests/brotli-decompressor-test.c
+++ b/tests/brotli-decompressor-test.c
@@ -19,7 +19,7 @@
  */
 
 #include "test-utils.h"
-#include "content-sniffer/soup-brotli-decompressor.h"
+#include "soup-brotli-decompressor.h"
 
 static void
 test_brotli (void)