[glom: 4/4] Fixed merge conflict.

[Murray Cumming <murrayc src gnome org>]

commit 4043f6a1f511e1e28513e2d9fb12b2b967cb832d
Merge: 0b50bb0 b360b8b
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat May 1 23:17:31 2010 +0200

    Fixed merge conflict.

 ChangeLog                                          |   37 +++++++++++++
 Makefile_tests.am                                  |    5 ++
 glom/application.cc                                |    4 +-
 glom/base_db.cc                                    |    4 +-
 glom/base_db_table_data.cc                         |    4 +-
 glom/libglom/utils.h                               |    2 +-
 glom/mode_data/box_data.cc                         |    4 +-
 glom/mode_data/datawidget/combo.cc                 |    8 ++-
 .../datawidget/combochoiceswithtreemodel.cc        |    2 +-
 glom/mode_design/dialog_database_preferences.cc    |    6 ++-
 glom/mode_design/fields/dialog_fieldcalculation.cc |   11 +++-
 .../layout_item_dialogs/dialog_buttonscript.cc     |    8 +++-
 glom/python_embed/glom_python.cc                   |   46 +++++++++-------
 glom/python_embed/glom_python.h                    |    6 ++-
 glom/python_embed/python_module/py_glom_module.cc  |   42 ++++++++++++---
 po/POTFILES.in                                     |    1 +
 tests/test_python_execute_func.cc                  |    9 +++-
 tests/test_python_execute_func_bad_syntax.cc       |   56 ++++++++++++++++++++
 tests/test_python_execute_func_date.cc             |   14 ++++-
 tests/test_python_execute_script.cc                |    6 ++-
 20 files changed, 226 insertions(+), 49 deletions(-)
---
diff --cc ChangeLog
index fd13735,8e8db03..414fbcd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,39 +1,68 @@@
  2010-05-01  Murray Cumming  <murrayc murrayc com>
  
+ 	Python scripts and calcuations: Test buttons now show python errors.
+ 	
+ 	* glom/python_embed/glom_python.[h|cc]: 
+ 	glom_execute_python_function_implementation(), 
+ 	glom_evaluate_python_function_implementation(): Add an error_message output 
+ 	parameter, to report syntax errors, for instance.
+ 	* glom/mode_design/fields/dialog_fieldcalculation.cc:
+   * glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:
+   Show the python error, if any, when pressing the Test button.
+   * Other files: Adapt, ignoring the error message for now.
+   * Makefile_tests.am:
+ 	* tests/test_python_execute_func_bad_syntax.cc: Added a test of the new 
+ 	error_message parameter. 
+ 
+ 2010-05-01  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Fix a possible crash when showing choices.
+ 
+ 	* glom/mode_data/datawidget/combo.cc: set_text(): Don't show a warning if 
+ 	"" is not found because it's OK to use that to clear the combo.
+ 	* glom/mode_data/datawidget/combochoiceswithtreemodel.cc: 
+ 	set_choices_with_second(): Don't dereference a null smartpointer, avoiding 
+ 	a crash with one .glom file that I tried.
+ 
+ 2010-05-01  Murray Cumming  <murrayc murrayc com>
+ 
+ 	Python Glom API documentation improvement.
+ 	
+ 	* glom/python_embed/python_module/py_glom_module.cc: Turn off auto-writing 
+ 	of the Python signatures in the docstrings, because that is a) crappy and 
+ 	b) confuses the sphinx autodoc module, which adds an invisible ..function 
+ 	reStrucuredText line.
+ 	Add :param:, :type, and :returns: lines with the necessary indenting and 
+ 	empty lines needed by that invisible ..function line. 
++	
++2010-05-01  Murray Cumming  <murrayc murrayc com>
++
 +	Move some more methods from Base_DB.
 +	
 +	* glom/base_db.[h|cc]: Move show_warning_no_records_found() to utils_ui.[h|cc].
 +	get_find_where_clause_quick(): Move to utils.[h|cc].
 +	* glom/frame_glom.cc: Adapted.
 +	* glom/mode_design/layout/layout_item_dialogs/box_formatting.h:
 +	* glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.[h|cc]:
 +		* glom/mode_data/datawidget/dialog_choose_id.[h|cc]: Don't derive from Base_DB 
 +	because that is no longer necessary after adapting.
 +
 +2010-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	* glom/libglom/db_utils.cc: create_database(): Actually use the progress slot.
 +
 +2010-05-01  Murray Cumming  <murrayc murrayc com>
 +
 +	Move some Base_DB methods to DbUtils and test database recreation.
 +	
 +	* glom/base_db.[h|cc]: Move many db-related methods to 
 +	glom/libglom/db_utils.[h|cpp], taking a Document* paramater where necessary.
 +	This makes Base_DB slightly less of a mess, makes it clearer when we are 
 +	doing Database IO, and makes it possible to do more testing of non-UI code.
 +	* Makefile_tests.am:
 +	* tests/test_selfhost_new_from_example.cc: Use DbUtils to recreate the 
 +	database structure and data from the example file.
 +	* Many files: Adapted.
  
  2010-05-01  Murray Cumming  <murrayc murrayc com>
  
diff --cc Makefile_tests.am
index 1c474e3,c1df482..4cb0817
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@@ -48,10 -48,10 +49,11 @@@ TESTS =	tests/test_document_load	
  	tests/test_load_python_library \
  	tests/test_python_module \
  	tests/test_python_execute_func \
+ 	tests/test_python_execute_func_bad_syntax \
  	tests/test_python_execute_func_date \
  	tests/test_python_execute_script \
 -	tests/test_selfhosting_new_empty
 +	tests/test_selfhosting_new_empty \
 +	tests/test_selfhosting_new_from_example
  	
  # These hang most of the time, but not always:
  #	tests/import/test_parsing \
diff --cc glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
index 664d862,8e2e20d..b7c805a
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
@@@ -119,8 -120,9 +120,9 @@@ void Dialog_ButtonScript::on_button_tes
    }
  
    //We need the connection when we run the script, so that the script may use it.
 -  sharedptr<SharedConnection> sharedconnection = connect_to_server(this /* parent window */);
 +  sharedptr<SharedConnection> sharedconnection = ConnectionPool::get_and_connect();
  
+   Glib::ustring error_message;
    PythonUICallbacks callbacks;
    glom_execute_python_function_implementation(calculation,
      field_values, //TODO: Maybe use the field's type here.