Cleanup deprecated libsoup usage
* Use `soup_session_add_feature_by_type` instead of the option.
* Use strings instead of defines for libsoup properties.
The former are deprecated and removed from libsoup 3.
Testing Done:
Compile only.
Reviewed at https://reviews.imfreedom.org/r/574/
--- a/libpurple/protocols/facebook/api.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/facebook/api.c Wed Mar 17 04:13:27 2021 -0500
@@ -1922,8 +1922,9 @@
priv->cons = soup_session_new_with_options(
- SOUP_SESSION_PROXY_RESOLVER, resolver, SOUP_SESSION_USER_AGENT,
+ "proxy-resolver", resolver, + "user-agent", FB_API_AGENT, priv->mqtt = fb_mqtt_new(gc);
g_signal_connect(priv->mqtt,
--- a/libpurple/protocols/facebook/data.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/facebook/data.c Wed Mar 17 04:13:27 2021 -0500
@@ -174,8 +174,8 @@
fata = g_object_new(FB_TYPE_DATA, NULL);
- priv->cons = soup_session_new_with_options(SOUP_SESSION_PROXY_RESOLVER,
+ priv->cons = soup_session_new_with_options("proxy-resolver", resolver, priv->api = fb_api_new(gc, resolver);
--- a/libpurple/protocols/gg/edisc.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/gg/edisc.c Wed Mar 17 04:13:27 2021 -0500
@@ -109,9 +109,9 @@
accdata->edisc_data = sdata;
- sdata->session = soup_session_new_with_options(
- SOUP_SESSION_PROXY_RESOLVER, resolver,
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_COOKIE_JAR, NULL);
+ sdata->session = soup_session_new_with_options("proxy-resolver", resolver, + soup_session_add_feature_by_type(sdata->session, SOUP_TYPE_COOKIE_JAR); sdata->xfers_initialized = g_hash_table_new(g_str_hash, g_str_equal);
sdata->xfers_history = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
--- a/libpurple/protocols/gg/gg.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/gg/gg.c Wed Mar 17 04:13:27 2021 -0500
@@ -782,8 +782,8 @@
purple_connection_set_protocol_data(gc, info);
- info->http = soup_session_new_with_options(SOUP_SESSION_PROXY_RESOLVER,
+ info->http = soup_session_new_with_options("proxy-resolver", resolver, ggp_tcpsocket_setup(gc, glp);
--- a/libpurple/protocols/jabber/bosh.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/jabber/bosh.c Wed Mar 17 04:13:27 2021 -0500
@@ -121,9 +121,10 @@
conn = g_new0(PurpleJabberBOSHConnection, 1);
conn->payload_reqs = soup_session_new_with_options(
- SOUP_SESSION_PROXY_RESOLVER, resolver, SOUP_SESSION_TIMEOUT,
- JABBER_BOSH_TIMEOUT + 2, SOUP_SESSION_USER_AGENT,
- jabber_bosh_useragent, NULL);
+ "proxy-resolver", resolver, + "timeout", JABBER_BOSH_TIMEOUT + 2, + "user-agent", jabber_bosh_useragent, conn->url = g_strdup(url);
conn->is_ssl = (url_p->scheme == SOUP_URI_SCHEME_HTTPS);
--- a/libpurple/protocols/jabber/jabber.c Sat Mar 13 15:33:49 2021 -0600
+++ b/libpurple/protocols/jabber/jabber.c Wed Mar 17 04:13:27 2021 -0500
@@ -919,8 +919,8 @@
js = g_new0(JabberStream, 1);
purple_connection_set_protocol_data(gc, js);
- js->http_conns = soup_session_new_with_options(SOUP_SESSION_PROXY_RESOLVER,
+ js->http_conns = soup_session_new_with_options("proxy-resolver", resolver, g_object_unref(resolver);
/* we might want to expose this at some point */