[glom/maemo5: 3/4] Merge branch 'master' into maemo5

[Murray Cumming <murrayc src gnome org>]

commit 79889f67af7a31e6e9a19afe231265624d6c66ab
Merge: 4640977... 27ae914...
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 25 09:36:09 2009 +0200

    Merge branch 'master' into maemo5

 ChangeLog                                          |   29 +++
 glom/libglom/connectionpool_backends/postgres.cc   |   14 +-
 glom/libglom/connectionpool_backends/postgres.h    |    6 +-
 .../connectionpool_backends/postgres_self.cc       |  238 +++++++++++++++++++-
 .../connectionpool_backends/postgres_self.h        |    8 +
 glom/libglom/document/document.cc                  |    2 +-
 glom/libglom/spawn_with_feedback.cc                |   61 +++++-
 glom/libglom/spawn_with_feedback.h                 |    8 +
 glom/utility_widgets/db_adddel/db_adddel.cc        |    2 +-
 9 files changed, 343 insertions(+), 25 deletions(-)
---
diff --cc ChangeLog
index 03d9dba,11b6d00..288675d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,34 +1,55 @@@
+ 2009-09-24  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Self-Hosting: Use the new ident configuration for PostgreSQL 8.4.
+ 
+ 	* glom/libglom/spawn_with_feedback.[h|cc]: Added an 
+ 	execute_command_line_and_wait() overload that has an output parameter 
+ 	for the stdout from the command.
+ 	* glom/libglom/connectionpool_backends/postgres_self.[h|cc]:
+ 	Added a get_postgresql_utils_version_as_number() utiltity method, 
+ 	and use it in set_network_shared() to use a different syntax for 
+ 	Postgres 8.4, hopefully fixing bug #595608
+ 
+ 2009-09-24  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Self-Hosting: Retry the connection just-long-enough.
+ 
+ 	* glom/libglom/connectionpool_backends/postgres.[h|cc]: attempt_connect(): 
+ 	Add a throw() declaration because we know that this really never throws, 
+ 	though other similar methods do.
+ 	* glom/libglom/connectionpool_backends/postgres_self.cc: connect():
+ 	If not network-shared then retry every second when the connection fails, 
+ 	because the (default) password really must be correct. Seems to work, 
+ 	requiring 6 retries on my system. 
+ 	However, we must still wait a hard-coded time to be sure of failure 
+ 	if the password is not the default one, for instance when network sharing.
+ 	* glom/libglom/spawn_with_feedback.cc: 
+ 	execute_command_line_and_wait_until_second_command_returns_success():
+ 	Remove the hacked 8-second wait here. 
+ 
  2009-09-23  Murray Cumming  <murrayc murrayc com>
  
 +	Maemo: Details: Do not show buttons.
 +
 +	* glom/mode_data/box_data_details.[h|cc]: ifdef out the buttons for maemo.
 +	* glom/glom.glade: Hack a HildonStackableWindow into the maemo5 branch 
 +	to avoid a warning with our get_widget_derived() call.
 +
 +2009-09-23  Murray Cumming  <murrayc murrayc com>
 +
 +	* glom/mode_data/box_data_details.cc: Rename the HBox member variables 
 +	to make their purposes clearer.
 +
 +2009-09-23  Murray Cumming  <murrayc murrayc com>
 +
 +	Maemo: Use Hildon::StackableWindow.
 +
 +	* glom/bakery/app_withdoc_gtk.h:
 +	* glom/window_boxholder.h: Use Hildon::StackableWindow instead of just 
 +	Hildon::Window because this always seems to be the right thing to do.
 +
 +2009-09-23  Murray Cumming  <murrayc murrayc com>
 +
  	Renamed Dialog_Glom to Window_BoxHolder.
  
  	* glom/dialog_glom.[h|cc]: Renamed to window_boxholder.[h|cc] to make