1 files changed, 3 insertions, 48 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 1909c2d0..fbf09588 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -877,26 +877,6 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="GNUNET_GTK_main_menu_file_search">
-                        <property name="label" translatable="yes">_Search</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Search GNUnet for files</property>
-                        <property name="accel_path">&lt;gnunet-fs-gtk&gt;/File sharing/Search</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="GNUNET_GTK_main_menu_file_search_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep2">
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="GNUNET_GTK_main_menu_file_download_uri">
                         <property name="label" translatable="yes">_Download</property>
                         <property name="use_action_appearance">False</property>
@@ -927,7 +907,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep3">
+                      <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_main_menu_file_sep2">
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1064,31 +1044,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="GNUNET_GTK_main_window_toolbar">
-            <property name="can_focus">False</property>
-            <property name="toolbar_style">icons</property>
-            <child>
-              <object class="GtkToolButton" id="GNUNET_GTK_toolbar_search">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Search</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkHBox" id="main_window_search_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -1316,7 +1271,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -1443,7 +1398,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">4</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>