[gnome-control-center/carlosgc/libsoup3: 263/264] color: port to libsoup3
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/carlosgc/libsoup3: 263/264] color: port to libsoup3
- Date: Tue, 5 Oct 2021 22:23:14 +0000 (UTC)
commit af3d9fd59c2ba971f150655592ee4edbab3a19e4
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Thu Jun 10 08:43:59 2021 +0200
color: port to libsoup3
panels/color/cc-color-panel.c | 28 +++++++++++-----------------
panels/color/meson.build | 2 +-
2 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 603178efc..ced69ac56 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -786,8 +786,8 @@ gcm_prefs_calib_upload_cb (CcColorPanel *prefs)
g_autofree gchar *data = NULL;
g_autoptr(GError) error = NULL;
gsize length;
- guint status_code;
- g_autoptr(SoupBuffer) buffer = NULL;
+ g_autoptr(GBytes) buffer = NULL;
+ g_autoptr(GBytes) body = NULL;
g_autoptr(SoupMessage) msg = NULL;
g_autoptr(SoupMultipart) multipart = NULL;
g_autoptr(SoupSession) session = NULL;
@@ -812,38 +812,32 @@ gcm_prefs_calib_upload_cb (CcColorPanel *prefs)
}
/* setup the session */
- session = soup_session_new_with_options (SOUP_SESSION_USER_AGENT, "gnome-control-center",
- SOUP_SESSION_TIMEOUT, 5000,
+ session = soup_session_new_with_options ("user-agent", "gnome-control-center",
+ "timeout", 5000,
NULL);
- if (session == NULL)
- {
- g_warning ("Failed to setup networking");
- return;
- }
- soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
-
/* create multipart form and upload file */
multipart = soup_multipart_new (SOUP_FORM_MIME_TYPE_MULTIPART);
- buffer = soup_buffer_new (SOUP_MEMORY_STATIC, data, length);
+ buffer = g_bytes_new_static (data, length);
soup_multipart_append_form_file (multipart,
"upload",
cd_profile_get_filename (profile),
NULL,
buffer);
upload_uri = g_settings_get_string (prefs->settings_colord, "profile-upload-uri");
- msg = soup_form_request_new_from_multipart (upload_uri, multipart);
- status_code = soup_session_send_message (session, msg);
- if (status_code != 201)
+ msg = soup_message_new_from_multipart (upload_uri, multipart);
+ body = soup_session_send_and_read (session, msg, NULL, &error);
+ if (soup_message_get_status != 201 || !body)
{
/* TRANSLATORS: this is when the upload of the profile failed */
- msg_result = g_strdup_printf (_("Failed to upload file: %s"), msg->reason_phrase),
+ msg_result = g_strdup_printf (_("Failed to upload file: %s"),
+ error ? error->message : soup_message_get_reason_phrase (msg));
gtk_label_set_label (GTK_LABEL (prefs->label_calib_upload_location), msg_result);
gtk_widget_show (prefs->label_calib_upload_location);
return;
}
/* show instructions to the user */
- uri = soup_message_headers_get_one (msg->response_headers, "Location");
+ uri = soup_message_headers_get_one (soup_message_get_response_headers (msg), "Location");
msg_result = g_strdup_printf ("%s %s\n\n• %s\n• %s\n• %s",
/* TRANSLATORS: these are instructions on how to recover
* the ICC profile on the native operating system and are
diff --git a/panels/color/meson.build b/panels/color/meson.build
index 742caf67b..51f6b04a2 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -44,7 +44,7 @@ deps = common_deps + [
gnome_desktop_dep,
m_dep,
dependency('colord-gtk', version: '>= 0.1.24'),
- dependency('libsoup-2.4')
+ dependency('libsoup-3.0', version: '>= 2.99.8')
]
panels_libs += static_library(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]