Merge branch 'master' into ui-improvements

diff --cc info.c
index 4275ad6ff7b32c7973059b12dd487e7b1d8657bb,9abbbec400e58efff5b11cdc9044e933e68f04f9..62a72e1405815ba958eac8a1b1e3db4b0f47a4c7
--- 1/info.c
--- 2/info.c
+++ b/info.c
@@@ -164,14 -181,19 +181,14 @@@ static GtkTextBuffer *text_view(GtkWidg
        return buffer;
  }
  
 -GtkWidget *extended_dive_info_frame(void)
 +GtkWidget *extended_dive_info_widget(void)
  {
 -      GtkWidget *frame;
        GtkWidget *vbox;
  
 -      frame = gtk_frame_new("Extended dive info");
 -      gtk_widget_show(frame);
 -
        vbox = gtk_vbox_new(FALSE, 5);
 -      gtk_container_add(GTK_CONTAINER(frame), vbox);
  
-       location = text_entry(vbox, "Location", FALSE);
-       notes = text_entry(vbox, "Notes", TRUE);
+       location = text_entry(vbox, "Location");
+       notes = text_view(vbox, "Notes", TRUE);
  
        /* Add extended info here: name, description, yadda yadda */
        update_dive_info(current_dive);