1 files changed, 30 insertions, 24 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index cbe41ad9..94e03bef 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -182,7 +182,7 @@
   <object class="GtkImage" id="down_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-go-down</property>
+    <property name="icon_name">go-down</property>
   </object>
   <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
     <property name="mode">vertical</property>
@@ -195,12 +195,12 @@
   <object class="GtkImage" id="find_and_replace_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-find-and-replace</property>
+    <property name="icon_name">edit-find-replace</property>
   </object>
   <object class="GtkImage" id="find_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-find</property>
+    <property name="icon_name">edit-find</property>
   </object>
   <object class="GtkImage" id="index_stock_image">
     <property name="visible">True</property>
@@ -423,11 +423,12 @@
     <signal name="configure-event" handler="GNUNET_GTK_main_window_configure_event_cb" swapped="no"/>
     <signal name="delete-event" handler="GNUNET_FS_GTK_delete_event_cb" after="yes" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
+      <object class="GtkBox" id="GNUNET_GTK_main_window_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkHBox" id="main_window_bottom_hbox">
+          <object class="GtkBox" id="main_window_bottom_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -662,15 +663,16 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="main_window_search_hbox">
+          <object class="GtkBox" id="main_window_search_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">3</property>
             <property name="spacing">4</property>
             <child>
-              <object class="GtkVBox" id="main_window_namespace_vbox">
+              <object class="GtkBox" id="main_window_namespace_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="main_window_search_namespace_label">
                     <property name="can_focus">False</property>
@@ -733,9 +735,10 @@ This operation will be executed using the anonymity level specified on the right
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="main_window_keywords_vbox">
+              <object class="GtkBox" id="main_window_keywords_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="GNUNET_FS_GTK_keyword_label">
                     <property name="visible">True</property>
@@ -797,9 +800,10 @@ This operation will be executed using the anonymity level specified on the right
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="main_window_anonymity_vbox">
+              <object class="GtkBox" id="main_window_anonymity_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="main_window_search_anonymity_label">
                     <property name="visible">True</property>
@@ -853,7 +857,7 @@ This operation will be executed using the anonymity level specified on the right
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="main_window_mime_vbox">
+              <object class="GtkBox" id="main_window_mime_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -939,13 +943,14 @@ This operation will be executed using the anonymity level specified on the right
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="main_window_hpaned">
+          <object class="GtkPaned" id="main_window_hpaned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="GNUNET_GTK_main_window_left_vbox">
+              <object class="GtkBox" id="GNUNET_GTK_main_window_left_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkNotebook" id="GNUNET_GTK_main_window_notebook">
                     <property name="visible">True</property>
@@ -1111,7 +1116,7 @@ This operation will be executed using the anonymity level specified on the right
                       </object>
                     </child>
                     <child type="tab">
-                      <object class="GtkHBox" id="GNUNET_GTK_download_frame_hbox">
+                      <object class="GtkBox" id="GNUNET_GTK_download_frame_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -1162,10 +1167,11 @@ This operation will be executed using the anonymity level specified on the right
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="GNUNET_GTK_search_frame_download_vbox">
+                  <object class="GtkBox" id="GNUNET_GTK_search_frame_download_vbox">
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_into_hbox">
+                      <object class="GtkBox" id="GNUNET_GTK_search_frame_download_into_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">4</property>
@@ -1173,10 +1179,10 @@ This operation will be executed using the anonymity level specified on the right
                           <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_location_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="yalign">0.43999999761581421</property>
                             <property name="label" translatable="yes">Download into:</property>
                             <property name="single_line_mode">True</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.43999999761581421</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1205,7 +1211,7 @@ This operation will be executed using the anonymity level specified on the right
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_filename_hbox">
+                      <object class="GtkBox" id="GNUNET_GTK_search_frame_download_filename_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">4</property>
@@ -1213,10 +1219,10 @@ This operation will be executed using the anonymity level specified on the right
                           <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_filename_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="yalign">0.43999999761581421</property>
                             <property name="label" translatable="yes">Download as:</property>
                             <property name="single_line_mode">True</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.43999999761581421</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1263,7 +1269,7 @@ This operation will be executed using the anonymity level specified on the right
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_misc_hbox">
+                      <object class="GtkBox" id="GNUNET_GTK_search_frame_download_misc_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">4</property>
@@ -1271,8 +1277,8 @@ This operation will be executed using the anonymity level specified on the right
                           <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_anonymity_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Anonymity:</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1337,7 +1343,7 @@ This operation will be executed using the anonymity level specified on the right
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_download_hbox">
+                      <object class="GtkBox" id="GNUNET_GTK_search_frame_download_download_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -1375,7 +1381,7 @@ This operation will be executed using the anonymity level specified on the right
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
+              <object class="GtkBox" id="GNUNET_GTK_main_window_extras_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>