[shotwell] publishing-extra: Remove deprecations from Tumblr

[Jens Georg <jensgeorg src gnome org>]

commit 7cd7dc282e5f4affac450257a779bdf90b47623d
Author: Jens Georg <mail jensge org>
Date:   Sat Oct 1 17:11:31 2016 +0200

    publishing-extra: Remove deprecations from Tumblr
    
    Signed-off-by: Jens Georg <mail jensge org>

 .../TumblrPublishing.vala                          |    5 +-
 .../tumblr_authentication_pane.ui                  |  181 +++++++++----------
 2 files changed, 89 insertions(+), 97 deletions(-)
---
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala 
b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index 35a7a0f..183bc31 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -602,7 +602,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
             builder = new Gtk.Builder();
             builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
             builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+            var content = builder.get_object ("content") as Gtk.Widget;
             
             Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
             switch (mode) {
@@ -628,7 +628,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
             password_entry.changed.connect(on_password_changed);
             login_button.clicked.connect(on_login_button_clicked);
 
-            align.reparent(pane_widget);
+            content.parent.remove (content);
+            pane_widget.add (content);
             publisher.get_host().set_dialog_default_widget(login_button);
         } catch (Error e) {
             warning(_("Could not load UI: %s"), e.message);
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui 
b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 98f03b8..9752a7c 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -1,130 +1,121 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkVBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.5</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="hexpand">True</property>
+        <property name="spacing">8</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">30</property>
-            <property name="margin_right">30</property>
             <property name="hexpand">True</property>
-            <property name="spacing">8</property>
+            <property name="vexpand">True</property>
+            <property name="label">label</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="field_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Email address</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">username_entry</property>
+                <property name="xalign">0</property>
+              </object>
+            </child>
             <child>
-              <object class="GtkLabel" id="message_label">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="label" translatable="yes">_Password</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry</property>
                 <property name="xalign">0</property>
-                <property name="label">label</property>
-                <property name="wrap">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="field_table">
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">8</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Email address</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">●</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Log in</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">Log in</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>