gnumeric r16438 - in trunk: . plugins/python-loader

[jody svn gnome org]

Author: jody
Date: Sun Mar  2 15:03:57 2008
New Revision: 16438
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16438&view=rev

Log:
David Reiser: Patch for OSX build of python plugin. [#510059]


Modified:
   trunk/NEWS
   trunk/plugins/python-loader/ChangeLog
   trunk/plugins/python-loader/gnm-python.c
   trunk/plugins/python-loader/py-gnumeric.c
   trunk/plugins/python-loader/python-loader.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Mar  2 15:03:57 2008
@@ -1,5 +1,8 @@
 Gnumeric 1.9.0
 
+David Reiser:
+	* Patch for OSX build of python plugin. [#510059]
+
 Hans de Goede:
 	* Fix broken xls issues.  [#505330]
 

Modified: trunk/plugins/python-loader/gnm-python.c
==============================================================================
--- trunk/plugins/python-loader/gnm-python.c	(original)
+++ trunk/plugins/python-loader/gnm-python.c	Sun Mar  2 15:03:57 2008
@@ -6,9 +6,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <Python.h>
-#include <pygobject.h>
-#include <glib.h>
+
 #include "gnm-py-interpreter.h"
 #include "gnm-python.h"
 #include "py-gnumeric.h"
@@ -22,6 +20,10 @@
 #include <glib/gi18n-lib.h>
 #include <unistd.h>
 
+#include <Python.h>
+#define NO_IMPORT_PYGOBJECT
+#include <pygobject.h>
+
 struct _GnmPython {
 	GObject parent_instance;
 

Modified: trunk/plugins/python-loader/py-gnumeric.c
==============================================================================
--- trunk/plugins/python-loader/py-gnumeric.c	(original)
+++ trunk/plugins/python-loader/py-gnumeric.c	Sun Mar  2 15:03:57 2008
@@ -6,10 +6,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <Python.h>
 #include <gnumeric.h>
-#include <glib.h>
-#include "pygobject.h"
 #include "application.h"
 #include "workbook.h"
 #include "cell.h"
@@ -22,13 +19,18 @@
 #include "func.h"
 #include "str.h"
 #include "wbc-gtk.h"
-#include <goffice/app/go-plugin.h>
 #include "parse-util.h"
 #include "gnm-py-interpreter.h"
 #include "py-gnumeric.h"
 
+#include <goffice/app/go-plugin.h>
+
 #include <glib/gi18n-lib.h>
 
+#include <Python.h>
+#define NO_IMPORT_PYGOBJECT
+#include <pygobject.h>
+
 static PyTypeObject py_Boolean_object_type;
 typedef struct _py_Boolean_object py_Boolean_object;
 static PyObject *py_new_Boolean_object (gboolean value);

Modified: trunk/plugins/python-loader/python-loader.c
==============================================================================
--- trunk/plugins/python-loader/python-loader.c	(original)
+++ trunk/plugins/python-loader/python-loader.c	Sun Mar  2 15:03:57 2008
@@ -9,8 +9,6 @@
 #include <gnumeric.h>
 #include "python-loader.h"
 
-#include <Python.h>
-#include "pygobject.h"
 #include "py-gnumeric.h"
 #include "gnm-python.h"
 
@@ -30,11 +28,17 @@
 #include <goffice/app/go-plugin-service.h>
 #include <goffice/app/go-plugin-loader.h>
 #include <goffice/app/module-plugin-defs.h>
+
 #include <gsf/gsf-impl-utils.h>
+
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
+
 #include <stdlib.h>
-#include <glib.h>
+
+#include <Python.h>
+#define NO_IMPORT_PYGOBJECT
+#include <pygobject.h>
 
 typedef struct {
 	GObject base;