Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 12 insertions, 23 deletions

diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
index e20fb38..dd4c35c 100644
--- a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+++ b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkBox" id="pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -32,8 +33,7 @@
           <object class="GtkLabel" id="pin_entry_caption">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xpad">1</property>
-            <property name="ypad">1</property>
+            <property name="halign">end</property>
             <property name="label" translatable="yes">Authorization _Number:</property>
             <property name="use_underline">True</property>
             <property name="justify">right</property>
@@ -51,7 +51,6 @@
             <property name="can_focus">True</property>
             <property name="margin_left">8</property>
             <property name="invisible_char">●</property>
-            <property name="invisible_char_set">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -61,41 +60,31 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-      </object>
-      <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkButton" id="continue_button">
         <property name="label" translatable="yes">Con_tinue</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="margin_left">240</property>
         <property name="margin_right">240</property>
         <property name="margin_bottom">160</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="fill">False</property>
+        <property name="pack_type">end</property>
+        <property name="position">2</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>