1 files changed, 21 insertions, 12 deletions

diff --git a/contrib/gnunet_fs_gtk_progress_dialog.glade b/contrib/gnunet_fs_gtk_progress_dialog.glade
index c008d3e2..9433c942 100644
--- a/contrib/gnunet_fs_gtk_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_progress_dialog.glade
@@ -1,27 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">2</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
-    <property name="destroy_with_parent">True</property>
-    <signal name="delete_event" handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb"/>
+    <signal name="delete-event" handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkFrame" id="GNUNET_FS_GTK_progress_dialog_frame">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="GNUNET_FS_GTK_progress_dialog_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_progress_dialog_scrolled_window">
@@ -49,21 +58,25 @@
             <child type="label">
               <object class="GtkLabel" id="GNUNET_FS_GTK_progress_dialog_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">&lt;b&gt;Messages&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkProgressBar" id="GNUNET_FS_GTK_progress_dialog_progressbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="activity_mode">True</property>
             <property name="show_text">True</property>
-            <property name="pulse_step">0.05</property>
+            <property name="pulse_step">0.050000000000000003</property>
             <property name="text" translatable="yes">Preprocessing...</property>
             <property name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property>
             <property name="discrete_blocks">5</property>
@@ -77,6 +90,7 @@
         <child>
           <object class="GtkHBox" id="GNUNET_FS_GTK_progress_dialog_buttons_hbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">2</property>
             <child>
               <placeholder/>
@@ -84,11 +98,12 @@
             <child>
               <object class="GtkButton" id="GNUNET_FS_GTK_progress_dialog_cancel_button">
                 <property name="label">gtk-cancel</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_stock">True</property>
-                <signal name="clicked" handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -118,10 +133,4 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
 </interface>