[libsoup/wip/remove-deprecations: 10/13] Rename soup_client_context_get_socket to soup_client_context_get_soup_socket
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/remove-deprecations: 10/13] Rename soup_client_context_get_socket to soup_client_context_get_soup_socket
- Date: Mon, 24 Aug 2020 23:43:46 +0000 (UTC)
commit 14ab7f6ee5f9fc565bb6962256b5883ab7d38692
Author: Patrick Griffis <pgriffis igalia com>
Date: Mon Aug 24 12:21:26 2020 -0700
Rename soup_client_context_get_socket to soup_client_context_get_soup_socket
This is only private API now and we want that name for the GSocket
variant.
libsoup/soup-server-private.h | 2 +-
libsoup/soup-server.c | 7 ++-----
tests/connection-test.c | 6 +++---
3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/libsoup/soup-server-private.h b/libsoup/soup-server-private.h
index 102bbc80..15430e73 100644
--- a/libsoup/soup-server-private.h
+++ b/libsoup/soup-server-private.h
@@ -20,4 +20,4 @@
#include "soup-server.h"
-SoupSocket *soup_client_context_get_socket (SoupClientContext *client);
+SoupSocket *soup_client_context_get_soup_socket (SoupClientContext *client);
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 30d66132..cbb945f8 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -1701,7 +1701,7 @@ soup_server_get_uris (SoupServer *server)
G_DEFINE_BOXED_TYPE (SoupClientContext, soup_client_context, soup_client_context_ref,
soup_client_context_unref)
/**
- * soup_client_context_get_socket:
+ * soup_client_context_get_soup_socket:
* @client: a #SoupClientContext
*
* Retrieves the #SoupSocket that @client is associated with.
@@ -1716,12 +1716,9 @@ G_DEFINE_BOXED_TYPE (SoupClientContext, soup_client_context, soup_client_context
*
* Return value: (transfer none): the #SoupSocket that @client is
* associated with.
- *
- * Deprecated: use soup_client_context_get_gsocket(), which returns
- * a #GSocket.
**/
SoupSocket *
-soup_client_context_get_socket (SoupClientContext *client)
+soup_client_context_get_soup_socket (SoupClientContext *client)
{
g_return_val_if_fail (client != NULL, NULL);
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 825fd9a9..9095d84f 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -62,7 +62,7 @@ timeout_request_started (SoupServer *server, SoupMessage *msg,
g_signal_handlers_disconnect_by_func (server, timeout_request_started, NULL);
- sock = soup_client_context_get_socket (client);
+ sock = soup_client_context_get_soup_socket (client);
readable = g_signal_connect (sock, "readable",
G_CALLBACK (timeout_socket), NULL);
@@ -140,7 +140,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
* the declared Content-Length. Instead, we
* forcibly close the socket at that point.
*/
- sock = soup_client_context_get_socket (context);
+ sock = soup_client_context_get_soup_socket (context);
g_signal_connect (msg, "wrote-chunk",
G_CALLBACK (close_socket), sock);
} else if (no_close) {
@@ -158,7 +158,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
if (!strcmp (path, "/timeout-persistent")) {
SoupSocket *sock;
- sock = soup_client_context_get_socket (context);
+ sock = soup_client_context_get_soup_socket (context);
setup_timeout_persistent (server, sock);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]