[glom/maemo5: 5/5] Merge branch 'master' into maemo5

[Murray Cumming <murrayc src gnome org>]

commit 0977acdbff483336bee27fc7423cd5ac6dc856c4
Merge: ff851cd... eccde55...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 25 14:09:42 2009 +0200

    Merge branch 'master' into maemo5

 ChangeLog                                          |   23 +++++++++-
 glom/libglom/connectionpool_backends/postgres.cc   |    2 +-
 .../connectionpool_backends/postgres_self.cc       |    8 ++--
 glom/libglom/spawn_with_feedback.cc                |   48 +++++++++++---------
 glom/utility_widgets/flowtable.cc                  |    2 +-
 tests/import/test_parsing.cc                       |    2 +-
 6 files changed, 55 insertions(+), 30 deletions(-)
---
diff --cc ChangeLog
index f1f2df9,311969e..a45cfc4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,24 +1,31 @@@
+ 1.12.0:
+ 
+ 2009-09-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Command spawning: Really check the return value.
+ 
+ 	* glom/libglom/spawn_with_feedback.cc:
+ 	execute_command_line_and_wait_until_second_command_returns_success():
+ 	Actually check the return value of the first command, so we can fail 
+ 	immediately (with stderr output) when, for instance, postgresql 
+ 	fails to read the configuration file due to changed options, such as 
+ 	no longer recognizing max_fsm_pages in PostgreSQL 8.4
+ 
+ 2009-09-25  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Replace some NULLs with 0 because this is C++, not C.
+ 
+ 	* glom/libglom/connectionpool_backends/postgres.cc:
+ 	* glom/libglom/connectionpool_backends/postgres_self.cc:
+ 	* glom/libglom/spawn_with_feedback.cc: Replace NULLs with 0.
+ 
 +2009-09-25  Murray Cumming  <murrayc murrayc com>
 +
 +	Maemo: Fix the non-exceptions build again.
 +	
 +	* glom/print_layout/canvas_print_layout.cc: Added ifdefs around KeyFile 
 +	calls. I wonder why I only noticed this now.
 +
  2009-09-24  Murray Cumming  <murrayc murrayc com>
  
  	Self-Hosting: Use the new ident configuration for PostgreSQL 8.4.