Make SoupMessage a private and final type

3 files changed, 22 insertions, 22 deletions

diff --git a/examples/get.c b/examples/get.c
index 0a429252..48c35f0a 100644
--- a/examples/get.c
+++ b/examples/get.c
@@ -42,19 +42,19 @@ get_url (const char *url)
 	name = soup_message_get_uri (msg)->path;
 
 	if (!debug) {
-		if (msg->status_code == SOUP_STATUS_SSL_FAILED) {
+		if (soup_message_get_status (msg) == SOUP_STATUS_SSL_FAILED) {
 			GTlsCertificateFlags flags;
 
 			if (soup_message_get_https_status (msg, NULL, &flags))
-				g_print ("%s: %d %s (0x%x)\n", name, msg->status_code, msg->reason_phrase, flags);
+				g_print ("%s: %d %s (0x%x)\n", name, soup_message_get_status (msg), soup_message_get_reason_phrase (msg), flags);
 			else
-				g_print ("%s: %d %s (no handshake status)\n", name, msg->status_code, msg->reason_phrase);
-		} else if (!quiet || SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code))
-			g_print ("%s: %d %s\n", name, msg->status_code, msg->reason_phrase);
+				g_print ("%s: %d %s (no handshake status)\n", name, soup_message_get_status (msg), soup_message_get_reason_phrase (msg));
+		} else if (!quiet || SOUP_STATUS_IS_TRANSPORT_ERROR (soup_message_get_status (msg)))
+			g_print ("%s: %d %s\n", name, soup_message_get_status (msg), soup_message_get_reason_phrase (msg));
 	}
 
-	if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
-		header = soup_message_headers_get_one (msg->response_headers,
+	if (SOUP_STATUS_IS_REDIRECTION (soup_message_get_status (msg))) {
+		header = soup_message_headers_get_one (soup_message_get_response_headers (msg),
 						       "Location");
 		if (header) {
 			SoupURI *uri;
@@ -69,7 +69,7 @@ get_url (const char *url)
 			g_free (uri_string);
 			soup_uri_free (uri);
 		}
-	} else if (!head && SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
+	} else if (!head && SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (msg))) {
 		if (output_file_path) {
 			output_file = fopen (output_file_path, "w");
 			if (!output_file)
diff --git a/examples/simple-httpd.c b/examples/simple-httpd.c
index 8cfed4b5..3c5b534b 100644
--- a/examples/simple-httpd.c
+++ b/examples/simple-httpd.c
@@ -117,7 +117,7 @@ do_get (SoupServer *server, SoupMessage *msg, const char *path)
 		return;
 	}
 
-	if (msg->method == SOUP_METHOD_GET) {
+	if (soup_message_get_method (msg) == SOUP_METHOD_GET) {
 		GMappedFile *mapping;
 		GBytes *buffer;
 
@@ -132,7 +132,7 @@ do_get (SoupServer *server, SoupMessage *msg, const char *path)
 						     (GDestroyNotify)g_mapped_file_unref, g_steal_pointer (&mapping));
 		soup_message_body_append_bytes (msg->response_body, buffer);
 		g_bytes_unref (buffer);
-	} else /* msg->method == SOUP_METHOD_HEAD */ {
+	} else /* soup_message_get_method (msg) == SOUP_METHOD_HEAD */ {
 		char *length;
 
 		/* We could just use the same code for both GET and
@@ -140,7 +140,7 @@ do_get (SoupServer *server, SoupMessage *msg, const char *path)
 		 * But we'll optimize and avoid the extra I/O.
 		 */
 		length = g_strdup_printf ("%lu", (gulong)st.st_size);
-		soup_message_headers_append (msg->response_headers,
+		soup_message_headers_append (soup_message_get_response_headers (msg),
 					     "Content-Length", length);
 		g_free (length);
 	}
@@ -156,7 +156,7 @@ do_put (SoupServer *server, SoupMessage *msg, const char *path)
 	gboolean created = TRUE;
 
 	if (g_stat (path, &st) != -1) {
-		const char *match = soup_message_headers_get_one (msg->request_headers, "If-None-Match");
+		const char *match = soup_message_headers_get_one (soup_message_get_request_headers (msg), "If-None-Match");
 		if (match && !strcmp (match, "*")) {
 			soup_message_set_status (msg, SOUP_STATUS_CONFLICT);
 			return;
@@ -191,9 +191,9 @@ server_callback (SoupServer *server, SoupMessage *msg,
 	SoupMessageHeadersIter iter;
 	const char *name, *value;
 
-	g_print ("%s %s HTTP/1.%d\n", msg->method, path,
+	g_print ("%s %s HTTP/1.%d\n", soup_message_get_method (msg), path,
 		 soup_message_get_http_version (msg));
-	soup_message_headers_iter_init (&iter, msg->request_headers);
+	soup_message_headers_iter_init (&iter, soup_message_get_request_headers (msg));
 	while (soup_message_headers_iter_next (&iter, &name, &value))
 		g_print ("%s: %s\n", name, value);
 	if (msg->request_body->length)
@@ -201,15 +201,15 @@ server_callback (SoupServer *server, SoupMessage *msg,
 
 	file_path = g_strdup_printf (".%s", path);
 
-	if (msg->method == SOUP_METHOD_GET || msg->method == SOUP_METHOD_HEAD)
+	if (soup_message_get_method (msg) == SOUP_METHOD_GET || soup_message_get_method (msg) == SOUP_METHOD_HEAD)
 		do_get (server, msg, file_path);
-	else if (msg->method == SOUP_METHOD_PUT)
+	else if (soup_message_get_method (msg) == SOUP_METHOD_PUT)
 		do_put (server, msg, file_path);
 	else
 		soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
 
 	g_free (file_path);
-	g_print ("  -> %d %s\n\n", msg->status_code, msg->reason_phrase);
+	g_print ("  -> %d %s\n\n", soup_message_get_status (msg), soup_message_get_reason_phrase (msg));
 }
 
 static void
diff --git a/examples/simple-proxy.c b/examples/simple-proxy.c
index 4f8f5af3..eb0433bb 100644
--- a/examples/simple-proxy.c
+++ b/examples/simple-proxy.c
@@ -285,16 +285,16 @@ server_callback (SoupServer *server, SoupMessage *msg,
 	char *uristr;
 
 	uristr = soup_uri_to_string (soup_message_get_uri (msg), FALSE);
-	g_print ("[%p] %s %s HTTP/1.%d\n", msg, msg->method, uristr,
+	g_print ("[%p] %s %s HTTP/1.%d\n", msg, soup_message_get_method (msg), uristr,
 		 soup_message_get_http_version (msg));
 
-	if (msg->method == SOUP_METHOD_CONNECT) {
+	if (soup_message_get_method (msg) == SOUP_METHOD_CONNECT) {
 		try_tunnel (server, msg, context);
 		return;
 	}
 
-        msg2 = soup_message_new (msg->method, uristr);
-	soup_message_headers_foreach (msg->request_headers, copy_header,
+        msg2 = soup_message_new (soup_message_get_method (msg), uristr);
+	soup_message_headers_foreach (soup_message_get_request_headers (msg), copy_header,
 				      msg2->request_headers);
 	soup_message_headers_remove (msg2->request_headers, "Host");
 	soup_message_headers_remove (msg2->request_headers, "Connection");
@@ -304,7 +304,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
 		soup_message_body_append_bytes (msg2->request_body, request);
 		g_bytes_unref (request);
 	}
-	soup_message_headers_set_encoding (msg->response_headers,
+	soup_message_headers_set_encoding (soup_message_get_response_headers (msg),
 					   SOUP_ENCODING_CHUNKED);
 
 	g_signal_connect (msg2, "got_headers",