eog r4425 - in trunk: . bindings/python src

[lucasr svn gnome org]

Author: lucasr
Date: Mon Mar  3 21:52:16 2008
New Revision: 4425
URL: http://svn.gnome.org/viewvc/eog?rev=4425&view=rev

Log:
2008-03-03  Lucas Rocha  <lucasr gnome org>

	* bindings/python/eog.override, src/eog-python-plugin.c: avoid multiply 
	defined symbols when linking Python bindings by using
	NO_IMPORT_PYGOBJECT and NO_IMPORT before inclusing pygtk and pygobject
	headers. Fixes bug #506421 (Paul).


Modified:
   trunk/ChangeLog
   trunk/bindings/python/eog.override
   trunk/src/eog-python-plugin.c

Modified: trunk/bindings/python/eog.override
==============================================================================
--- trunk/bindings/python/eog.override	(original)
+++ trunk/bindings/python/eog.override	Mon Mar  3 21:52:16 2008
@@ -1,6 +1,6 @@
 %%
 headers
-#define NO_IMPORT_PYGOBJECT
+#define NO_IMPORT
 #include "pygobject.h"
 #include <pygtk/pygtk.h>
 

Modified: trunk/src/eog-python-plugin.c
==============================================================================
--- trunk/src/eog-python-plugin.c	(original)
+++ trunk/src/eog-python-plugin.c	Mon Mar  3 21:52:16 2008
@@ -28,6 +28,7 @@
 #include "eog-plugin.h"
 #include "eog-debug.h"
 
+#define NO_IMPORT_PYGOBJECT
 #include <pygobject.h>
 #include <string.h>