[glom: 4/4] Fix merge

[Murray Cumming <murrayc src gnome org>]

commit 1249f1176cfa2605685193b5ee4b962c36fd05ff
Merge: fb690e8... 829cab4...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 30 17:02:55 2009 +0100

    Fix merge

 ChangeLog    |   12 +++++++++---
 configure.ac |    2 +-
 glom/main.cc |    6 ++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --cc ChangeLog
index 186c83b,6e61f72..a083395
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,9 +1,29 @@@
 +2009-10-30  Murray Cumming  <murrayc murrayc com>
 +
 +	List views and related records portals: Enough space for titles.
 +
 +	* glom/utils_ui.[h|cc]: get_suitable_field_width_for_widget():
 +	Optionally calculate enough space for the title too, for TreeView 
 +	columns.
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: treeview_append_column():
 +	When choosing a default column width, make sure there's enough for the 
 +	title too.
 +
 +2009-10-30  Murray Cumming  <murrayc murrayc com>
 +
 +	List views and related records portals: Avoid zero-width columns.
 +
 +	* glom/utility_widgets/db_adddel/db_adddel.cc: treeview_append_column():
 +	Except on maemo, don't try to auto-expand a non-rightmost column, 
 +	because that does not seem to be possible with fixed-height-mode, 
 +	which we use for performance.
 +
+ 2009-10-30  David King  <davidk openismus com>
+ 
+ 	* configure.ac:
+ 	* glom/main.cc: Initialize libossomm on Maemo, to register a DBus
+ 	service.
+ 
  2009-10-28  David King  <davidk openismus com>
  
  	* configure.ac: