From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Sep 2011 17:08:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=15e3b5f4414d320dbace1bd3913b07d35bd9e9ee;p=ext%2Fsubsurface.git

Merge branch 'for-linus' of git://github.com/dirkhh/subsurface

* 'for-linus' of git://github.com/dirkhh/subsurface:
  Attempt to get the location column to resize in a sensible way
  Minor tweaks to column headers

[ Fixed up minor semantic merge conflict due to the change to make
  'dive_list' internal to divelist.c ]
---

15e3b5f4414d320dbace1bd3913b07d35bd9e9ee
diff --cc divelist.c
index 24d4014,338b4dd..0a601c5
--- a/divelist.c
+++ b/divelist.c
@@@ -351,14 -341,27 +351,27 @@@ void update_dive_list_units(void
  
  	switch (output_units.length) {
  	case METERS:
- 		unit = "m";
+ 		unit = "max/m";
  		break;
  	case FEET:
- 		unit = "ft";
+ 		unit = "max/ft";
  		break;
  	}
 -	gtk_tree_view_column_set_title(dive_list->depth, unit);
 +	gtk_tree_view_column_set_title(dive_list.depth, unit);
  
+ 	switch (output_units.temperature) {
+ 	case CELSIUS:
+ 		unit = "degC";
+ 		break;
+ 	case FAHRENHEIT:
+ 		unit = "degF";
+ 		break;
+ 	case KELVIN:
+ 		unit = "Kelvin";
+ 		break;
+ 	}
 -	gtk_tree_view_column_set_title(dive_list->temperature, unit);
++	gtk_tree_view_column_set_title(dive_list.temperature, unit);
+ 
  	gtk_tree_model_foreach(model, set_one_dive, NULL);
  }
  
@@@ -452,16 -459,16 +468,16 @@@ GtkWidget *dive_list_create(void
  	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
  	gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
  
- 	dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0);
- 	dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1);
- 	dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1);
- 	dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0);
- 	dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "deg", temperature_data_func, 1);
- 	dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0);
- 	dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1);
- 	dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1);
+ 	dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
+ 	dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
+ 	dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
+ 	dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
+ 	dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
+ 	dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
+ 	dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
+ 	dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
  
 -	fill_dive_list(&dive_list);
 +	fill_dive_list();
  
  	g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
  					  "search-column", 0,