Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 3fafe37..8c5222a 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1347,7 +1347,7 @@ internal class GraphSession {
             unowned uint8[] payload = (uint8[]) mapped_file.get_contents();
             payload.length = (int) mapped_file.get_length();
             
-            Soup.Buffer image_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, payload);
+            var image_data = new Soup.Buffer.with_owner (payload, this, null);
             
             Soup.Multipart mp_envelope = new Soup.Multipart("multipart/form-data");
             
@@ -1447,9 +1447,9 @@ internal class GraphSession {
         
         // these error types are always recoverable given the unique behavior of the Facebook
         // endpoint, so try again
-        if (msg.status_code == Soup.KnownStatusCode.IO_ERROR ||
-            msg.status_code == Soup.KnownStatusCode.MALFORMED ||
-            msg.status_code == Soup.KnownStatusCode.TRY_AGAIN) {
+        if (msg.status_code == Soup.Status.IO_ERROR ||
+            msg.status_code == Soup.Status.MALFORMED ||
+            msg.status_code == Soup.Status.TRY_AGAIN) {
             real_message.bytes_so_far = 0;
             soup_session.queue_message(msg, null);
             return;
@@ -1460,8 +1460,8 @@ internal class GraphSession {
         
         Spit.Publishing.PublishingError? error = null;
         switch (msg.status_code) {
-            case Soup.KnownStatusCode.OK:
-            case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
+            case Soup.Status.OK:
+            case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
                                                // resource was created in response to a PUT
                                                // or POST
             break;
@@ -1471,14 +1471,14 @@ internal class GraphSession {
                     "OAuth Access Token has Expired. Logout user.");
             break;
             
-            case Soup.KnownStatusCode.CANT_RESOLVE:
-            case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
+            case Soup.Status.CANT_RESOLVE:
+            case Soup.Status.CANT_RESOLVE_PROXY:
                 error = new Spit.Publishing.PublishingError.NO_ANSWER(
                     "Unable to resolve %s (error code %u)", real_message.get_uri(), msg.status_code);
             break;
             
-            case Soup.KnownStatusCode.CANT_CONNECT:
-            case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
+            case Soup.Status.CANT_CONNECT:
+            case Soup.Status.CANT_CONNECT_PROXY:
                 error = new Spit.Publishing.PublishingError.NO_ANSWER(
                     "Unable to connect to %s (error code %u)", real_message.get_uri(), msg.status_code);
             break;