aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-python-extension.c1
-rw-r--r--src/epiphany.override1
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 05094cf3a..3d10ff3d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-01-08 Diego Escalante Urrelo <diegoe@svn.gnome.org>
+ * src/ephy-python-extension.c:
+ * src/epiphany.override:
+
+ Fixes a problem at link time on Darwin, bug #387233. Patch by paul.
+
+2007-01-08 Diego Escalante Urrelo <diegoe@svn.gnome.org>
+
* embed/mozilla/EphyAboutModule.cpp:
Fixes the escaping in the error message "The page %s was not fully
diff --git a/src/ephy-python-extension.c b/src/ephy-python-extension.c
index 45ba83e94..7d3153c1a 100644
--- a/src/ephy-python-extension.c
+++ b/src/ephy-python-extension.c
@@ -27,6 +27,7 @@
#include "ephy-python-extension.h"
#include "ephy-python.h"
+#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include "ephy-extension.h"
diff --git a/src/epiphany.override b/src/epiphany.override
index cc218eaf0..1676d4e1a 100644
--- a/src/epiphany.override
+++ b/src/epiphany.override
@@ -21,6 +21,7 @@
%%
headers
#include <Python.h>
+#define NO_IMPORT
#include <pygobject.h>
#include <pygtk/pygtk.h>
#include "ephy-bookmarks.h"