[glom/boostpythonretry: 4/6] Merged from master.

[Murray Cumming <murrayc src gnome org>]

commit f5a1f02967d831450b35366ce1d70efbc17d7d43
Merge: d2d3b8f 7cb078f
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 2 18:45:49 2010 +0100

    Merged from master.

 ChangeLog                                         |    9 +++++++++
 glom/libglom/connectionpool.cc                    |    2 +-
 glom/libglom/python_embed/py_glom_record.h        |    5 ++---
 glom/libglom/python_embed/py_glom_relatedrecord.h |    6 +++---
 glom/python_embed/glom_python.cc                  |    6 +++---
 5 files changed, 18 insertions(+), 10 deletions(-)
---
diff --cc glom/libglom/python_embed/py_glom_record.h
index 2f7ea3b,f93a28f..a82953b
--- a/glom/libglom/python_embed/py_glom_record.h
+++ b/glom/libglom/python_embed/py_glom_record.h
@@@ -21,11 -21,10 +21,10 @@@
  #ifndef GLOM_PYTHON_GLOM_RECORD_H
  #define GLOM_PYTHON_GLOM_RECORD_H
  
- #define NO_IMPORT_PYGOBJECT
- #define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
- #include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
+ #define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+ #include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
  
 -#include <Python.h>
 +#include <boost/python.hpp>
  
  #include <libglom/document/document.h>
  #include <libglom/data_structure/field.h>
diff --cc glom/libglom/python_embed/py_glom_relatedrecord.h
index 818dcce,3de3bc9..855aba1
--- a/glom/libglom/python_embed/py_glom_relatedrecord.h
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.h
@@@ -21,11 -21,9 +21,11 @@@
  #ifndef GLOM_PYTHON_GLOM_RELATEDRECORD_H
  #define GLOM_PYTHON_GLOM_RELATEDRECORD_H
  
+ #define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+ #include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
+ 
 +#include <boost/python.hpp>
- #define NO_IMPORT_PYGOBJECT
- #define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
- #include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
 +
  #include <libglom/document/document.h>
  #include <libglom/data_structure/field.h>
  #include <glibmm/ustring.h>
diff --cc glom/python_embed/glom_python.cc
index aefef52,da6d98f..4568333
--- a/glom/python_embed/glom_python.cc
+++ b/glom/python_embed/glom_python.cc
@@@ -23,11 -23,13 +23,11 @@@
  #include <libglom/python_embed/py_glom_record.h>
  #include <libglom/python_embed/pygdavalue_conversions.h>
  
- //#include <Python.h>
- //#include <compile.h> /* for the PyCodeObject */
- //#include <eval.h> /* for PyEval_EvalCode */
 +#include <boost/python.hpp>
 +
+ #define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+ #include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
+ 
 -#include <Python.h>
 -#include <compile.h> /* for the PyCodeObject */
 -#include <eval.h> /* for PyEval_EvalCode */
 -
  #include "glom_python.h"
  #include <libglom/data_structure/glomconversions.h>
  #include <list>