Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 2eb78f3..dbfa3de 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -194,7 +194,7 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object {
             builder.add_from_resource (Resources.RESOURCE_PATH + "/yandex_publish_model.ui");
 
             builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+            var content = builder.get_object ("content") as Gtk.Widget;
 
             album_list = builder.get_object ("album_list") as Gtk.ComboBoxText;
             foreach (string key in list.keys)
@@ -208,8 +208,8 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object {
             publish_button.clicked.connect(on_publish_clicked);
             logout_button.clicked.connect(on_logout_clicked);
 
-            align.reparent(box);
-			box.set_child_packing(align, true, true, 0, Gtk.PackType.START);
+            content.parent.remove (content);
+            box.pack_start (content, true, true, 0);
         } catch (Error e) {
             warning("Could not load UI: %s", e.message);
         }
@@ -275,7 +275,7 @@ private class UploadTransaction: Transaction {
 
         int image_part_num = message_parts.get_length();
 
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]);
+        var bindable_data = new Soup.Buffer.take (photo_data.data);
         message_parts.append_form_file("", photo.get_serialized_file().get_path(), "image/jpeg", bindable_data);
 
         unowned Soup.MessageHeaders image_part_header;