1 files changed, 6 insertions, 35 deletions

diff --git a/contrib/gnunet_fs_gtk_progress_dialog.glade b/contrib/gnunet_fs_gtk_progress_dialog.glade
index 8f2b1743..6e63b9ee 100644
--- a/contrib/gnunet_fs_gtk_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_progress_dialog.glade
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
-    <property name="can_focus">False</property>
     <property name="border_width">2</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" swapped="no"/>
+    <signal name="delete_event" handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb"/>
     <child>
       <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkScrolledWindow" id="GNUNET_FS_GTK_progress_dialog_scrolled_window">
@@ -37,15 +36,12 @@
             </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>
           </object>
           <packing>
@@ -57,43 +53,23 @@
         <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/>
             </child>
             <child>
-              <object class="GtkButton" id="GNUNET_FS_GTK_progress_dialog_ok_button">
-                <property name="label">gtk-ok</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_ok_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <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" swapped="no"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb"/>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -106,12 +82,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="GNUNET_FS_GTK_progress_dialog_buttons_sizegroup">
-    <widgets>
-      <widget name="GNUNET_FS_GTK_progress_dialog_ok_button"/>
-      <widget name="GNUNET_FS_GTK_progress_dialog_cancel_button"/>
-    </widgets>
-  </object>
+  <object class="GtkSizeGroup" id="GNUNET_FS_GTK_progress_dialog_buttons_sizegroup"/>
   <object class="GtkTextBuffer" id="GNUNET_FS_GTK_progress_dialog_textbuffer"/>
   <object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment">
     <property name="upper">100</property>