[libsoup/wip/remove-deprecations: 11/13] Rename soup_client_context_get_gsocket to soup_client_context_get_socket

[Patrick Griffis <pgriffis src gnome org>]

commit 616318b947e89c8480681a6bc30009b5da57de00
Author: Patrick Griffis <pgriffis igalia com>
Date:   Mon Aug 24 12:23:49 2020 -0700

    Rename soup_client_context_get_gsocket to soup_client_context_get_socket

 docs/reference/libsoup-2.4-sections.txt | 2 +-
 libsoup/soup-server.c                   | 6 +++---
 libsoup/soup-server.h                   | 2 +-
 tests/ntlm-test.c                       | 2 +-
 tests/server-test.c                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index cc4db3b8..7760c86b 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -253,7 +253,7 @@ soup_client_context_get_remote_address
 soup_client_context_get_host
 soup_client_context_get_auth_domain
 soup_client_context_get_auth_user
-soup_client_context_get_gsocket
+soup_client_context_get_socket
 soup_client_context_steal_connection
 <SUBSECTION>
 soup_server_add_auth_domain
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index cbb945f8..5e44b6ea 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -1694,7 +1694,7 @@ soup_server_get_uris (SoupServer *server)
  *
  * soup_client_context_get_remote_address() and/or
  * soup_client_context_get_host() can be used to get information for
- * logging or debugging purposes. soup_client_context_get_gsocket() may
+ * logging or debugging purposes. soup_client_context_get_socket() may
  * also be of use in some situations (eg, tracking when multiple
  * requests are made on the same connection).
  **/
@@ -1726,7 +1726,7 @@ soup_client_context_get_soup_socket (SoupClientContext *client)
 }
 
 /**
- * soup_client_context_get_gsocket:
+ * soup_client_context_get_socket:
  * @client: a #SoupClientContext
  *
  * Retrieves the #GSocket that @client is associated with.
@@ -1744,7 +1744,7 @@ soup_client_context_get_soup_socket (SoupClientContext *client)
  * Since: 2.48
  **/
 GSocket *
-soup_client_context_get_gsocket (SoupClientContext *client)
+soup_client_context_get_socket (SoupClientContext *client)
 {
        g_return_val_if_fail (client != NULL, NULL);
 
diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index 4ede834d..57cd5ce2 100644
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -162,7 +162,7 @@ void            soup_server_unpause_message (SoupServer  *server,
 /* Client context */
 
 SOUP_AVAILABLE_IN_2_48
-GSocket        *soup_client_context_get_gsocket        (SoupClientContext *client);
+GSocket        *soup_client_context_get_socket        (SoupClientContext *client);
 SOUP_AVAILABLE_IN_2_48
 GSocketAddress *soup_client_context_get_local_address  (SoupClientContext *client);
 SOUP_AVAILABLE_IN_2_48
diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c
index dcacd74e..e1ee5e95 100644
--- a/tests/ntlm-test.c
+++ b/tests/ntlm-test.c
@@ -86,7 +86,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
        if (strstr (path, "/404"))
                not_found = TRUE;
 
-       socket = soup_client_context_get_gsocket (client);
+       socket = soup_client_context_get_socket (client);
        state = GPOINTER_TO_INT (g_hash_table_lookup (ts->connections, socket));
        auth = soup_message_headers_get_one (msg->request_headers,
                                             "Authorization");
diff --git a/tests/server-test.c b/tests/server-test.c
index 229a1e98..2f2bb814 100644
--- a/tests/server-test.c
+++ b/tests/server-test.c
@@ -800,7 +800,7 @@ mem_server_callback (SoupServer *server, SoupMessage *msg,
        addr = soup_client_context_get_remote_address (context);
        g_assert_nonnull (addr);
 
-       sock = soup_client_context_get_gsocket (context);
+       sock = soup_client_context_get_socket (context);
        g_assert_null (sock);
 
        host = soup_client_context_get_host (context);