diff -r a/po/fr.po b/po/fr.po
462c462
< msgstr "Nouvel &onglet"
---
> msgstr "Nouvel _onglet"
466c466
< msgstr "Nouvelle Fe&nêtre"
---
> msgstr "Nouvelle Fe_nêtre"
486c486
< msgstr "Afficher la barre d'&état"
---
> msgstr "Afficher la barre d'_état"
diff -r a/src/gwaei/gwaei.c b/src/gwaei/gwaei.c
54d53
<     gdk_threads_init ();
58d56
< gdk_threads_enter ();
60d57
< gdk_threads_leave ();
diff -r a/src/gwaei/searchwindow.c b/src/gwaei/searchwindow.c
1248c1248
<     gdk_cursor_unref (cursor);
---
>     g_object_unref (cursor);
diff -r a/src/gwaei/searchwindow-callbacks.c b/src/gwaei/searchwindow-callbacks.c
1835,1839c1835,1839
<     window = GW_SEARCHWINDOW (gtk_widget_get_ancestor (GTK_WIDGET (data), GW_TYPE_SEARCHWINDOW));
<     if (window == NULL) return;
<     di = LW_DICTINFO (data);
< 
<     gw_searchwindow_set_dictionary (window, di->load_position);
---
>     window = GW_SEARCHWINDOW (gtk_widget_get_ancestor (GTK_WIDGET (widget), GW_TYPE_SEARCHWINDOW));
>     if (NULL != window) {
>       di = LW_DICTINFO (data);
>       gw_searchwindow_set_dictionary (window, di->load_position);
>     }
1840a1841
> 
diff -r a/src/gwaei/searchwindow.ui b/src/gwaei/searchwindow.ui
206c206
<       <object class="GtkVBox" id="toplevel">
---
>       <object class="GtkBox" id="toplevel">
208a209
>         <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
1037c1038
<           <object class="GtkHBox" id="hbox4">
---
>           <object class="GtkHBox" id="result_search_box">
1159c1160
<             <property name="expand">True</property>
---
>             <property name="expand">False</property>
1170c1171
<               <object class="GtkVBox" id="vbox4">
---
>               <object class="GtkLabel" id="progress_label">
1173,1183d1173
<                 <child>
<                   <object class="GtkLabel" id="progress_label">
<                     <property name="visible">True</property>
<                     <property name="can_focus">False</property>
<                   </object>
<                   <packing>
<                     <property name="expand">True</property>
<                     <property name="fill">True</property>
<                     <property name="position">0</property>
<                   </packing>
<                 </child>
1206c1196
<             <property name="fill">True</property>
---
>             <property name="fill">False</property>
diff -r a/src/gwaei/window.c b/src/gwaei/window.c
98d97
<     priv->toplevel = GTK_WIDGET (gw_window_get_object (GW_WINDOW (window), "toplevel"));
99a99
>     priv->toplevel = GTK_WIDGET (gw_window_get_object (GW_WINDOW (window), "toplevel"));
205a206,208
>     GtkWidget *unused;
>     GtkWidget *menu;
>     GError* error;
217a221,222
>     error = NULL;
>     menu = NULL;
223c228,232
<       if (g_file_test (path, G_FILE_TEST_IS_REGULAR) && gtk_builder_add_from_file (priv->builder, path,  NULL))
---
>       if (NULL != error) {
>         g_error_free (error);
>         error = NULL;
>       }
>       if (g_file_test (path, G_FILE_TEST_IS_REGULAR) && gtk_builder_add_from_file (priv->builder, path,  &error))
226a236
>         unused = GTK_WIDGET (gtk_builder_get_object (priv->builder, "unused"));
228,230c238,256
<         g_assert (toplevel != NULL);
<         gtk_widget_reparent (toplevel, GTK_WIDGET (window));
< 
---
>         g_assert (unused != NULL && toplevel != NULL);
>         g_object_ref(toplevel);
>         gtk_container_remove (GTK_CONTAINER (unused), toplevel);
>         gtk_container_add (GTK_CONTAINER (window), toplevel);
>         g_object_unref(toplevel);
>   
>         gtk_widget_destroy (unused);
>         unused = NULL;
> 
>         // Ubuntu global menu fix: without reparenting the menu, to the same component,
>         // it doesn't show up.
>         menu = GTK_WIDGET (gtk_builder_get_object (priv->builder, "menubar"));
>         if (NULL != menu) {
>           g_object_ref(menu);
>           gtk_container_remove (GTK_CONTAINER (toplevel), menu);
>           gtk_container_add (GTK_CONTAINER (toplevel), menu);
>           g_object_unref(menu);
>           menu = NULL;
>         }
234c260
< 
---
>     
235a262,266
>     if (NULL != error) {
>       g_warning ("Couldn't load builder file: %s", error->message);
>       g_error_free (error);
>       error = NULL;
>     }