From: Nathan Samson <nathansamson@gmail.com>
Date: Sun, 4 Sep 2011 17:06:47 +0000 (+0200)
Subject: Merge branch 'master' into ui-improvements
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bcf12edfe9f9f00d39736d1cff791dbe8809f6f1;p=ext%2Fsubsurface.git

Merge branch 'master' into ui-improvements
---

bcf12edfe9f9f00d39736d1cff791dbe8809f6f1
diff --cc info.c
index 4275ad6,9abbbec..62a72e1
--- a/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);