summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@svn.gnome.org>2007-01-08 23:27:19 +0000
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-01-08 23:27:19 +0000
commitcc50d3527725ba00a80b022d73dd3ff176cd7973 (patch)
tree76fd81171afad70e58bf0ef2914d5a802955f5be
parent7041a130d6e0e6e0912334a75010c2201b75ed94 (diff)
downloadepiphany-cc50d3527725ba00a80b022d73dd3ff176cd7973.tar.gz
Fixes a problem at link time on Darwin, bug #387233. Patch by paul.
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. svn path=/branches/gnome-2-16/; revision=6804
-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 4cf34cbf9..474dddede 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"