[glom/maemo5: 7/8] Merge branch 'master' into maemo5

[Murray Cumming <murrayc src gnome org>]

commit 712538190ac5a4dba0eb8152b3d55dc60da8d0c5
Merge: 9f3c28c... 386a0ce...
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 5 11:44:50 2009 +0200

    Merge branch 'master' into maemo5

 ChangeLog                            |   30 +++++++
 glom/frame_glom.cc                   |   28 +++++-
 glom/glom.glade                      |  160 +++++++++++++++++++++++++---------
 glom/import_csv/csv_parser.cc        |    5 +-
 glom/libglom/data_structure/field.cc |   12 ++-
 glom/libglom/utils.cc                |   16 +++-
 6 files changed, 196 insertions(+), 55 deletions(-)
---
diff --cc ChangeLog
index e6a5bc7,98b8d0b..9a4a47a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,35 +1,43 @@@
+ 2009-10-05  Murray Cumming  <murrayc murrayc-desktop>
+ 
+ 	Export: Correct problems in the binary data for images: Escape newlines.
+ 
+ 	* glom/libglom/data_structure/field.cc: to_file_format(): Escape 
+ 	newlines as \012 instead of removing them, because this is probably 
+ 	what gda_binary_to_string() intends. 
+ 
+ 2009-10-05  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Export: Correct problems in the binary data for images.
+ 
+ 	* glom/libglom/data_structure/field.cc: to_file_format(): Escape 
+ 	newlines and quotes in binary data text, to workaround libgda bug 
+ 	https://bugzilla.gnome.org/show_bug.cgi?id=597390
+ 	* glom/frame_glom.cc: export_data_to_stream(): Double check that 
+ 	image data contains no newlines or quotes.
+ 	* glom/libglom/utils.cc: string_replace(): Avoid an endless loop 
+ 	when the search_for input parameter is empty.
+ 	This fixes bug #593304 (Michael Hasselmann)
+ 
+ 2009-10-04  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix regression: Actually show field choices again in combo boxes.
+   
+ 	* glom/libglom/utils.cc: get_choice_values(): Move the list_values.push_back() 
+ 	out of the ifdef block so we actually show field choices again in the combo 
+ 	boxes. This was broken by the commit from Johannes on 2009-07-30.
+ 	Hopefully ldtp tests will avoid this in future.
+ 
  2009-10-02  Murray Cumming  <murrayc murrayc com>
  
 +	Maemo: Really fall back to the standard layout if there is no maemo layout.
 +	
 +	* glom/libglom/document/document.cc: get_data_layout_groups_plus_new_fields():
 +	Really fall back to the standard layout if there is no maemo layout. 
 +	When creating a default layout, restrict the column count to 1. 
 +
 +2009-10-02  Murray Cumming  <murrayc murrayc com>
 +
  	Maemo: Avoid multi-column details layouts.
  	 
  	* glom/libglom/document/document.[h|cc]: