eog r4919 - in trunk: . bindings/python

[friemann svn gnome org]

Author: friemann
Date: Sat Jan  3 11:56:35 2009
New Revision: 4919
URL: http://svn.gnome.org/viewvc/eog?rev=4919&view=rev

Log:
2009-01-03  Felix Riemann  <friemann svn gnome org>

	* configure.ac: Update pygtk/gobject dependencies to version having
	GIO support. Drop gnome-python dependency as it was needed for
	PyGnomeVFS only.
	* bindings/python/Makefile.am: Take into account that codegen
	ships with PyGobject now.
	* bindings/python/eog.defs:
	* bindings/python/eog.override:
	Remove traces of broken GnomeVFS support from the Python bindings.


Modified:
   trunk/ChangeLog
   trunk/bindings/python/Makefile.am
   trunk/bindings/python/eog.defs
   trunk/bindings/python/eog.override
   trunk/configure.ac

Modified: trunk/bindings/python/Makefile.am
==============================================================================
--- trunk/bindings/python/Makefile.am	(original)
+++ trunk/bindings/python/Makefile.am	Sat Jan  3 11:56:35 2009
@@ -29,7 +29,8 @@
 	cd $(top_builddir)/src && $(MAKE) eog-enum-types.h
 
 eog.c: eog.defs eog.override $(top_builddir)/src/eog-enum-types.h
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
+	( cd $(srcdir) && $(PYGOBJECT_CODEGEN) \
+		--register $(PYGOBJECT_DEFSDIR)/gio-types.defs \
 		--register $(PYGTK_DEFSDIR)/pango-types.defs \
 		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
 		--register $(PYGTK_DEFSDIR)/gtk-types.defs \

Modified: trunk/bindings/python/eog.defs
==============================================================================
--- trunk/bindings/python/eog.defs	(original)
+++ trunk/bindings/python/eog.defs	Sat Jan  3 11:56:35 2009
@@ -398,11 +398,11 @@
   )
 )
 
-(define-function eog_image_new_uri
-  (c-name "eog_image_new_uri")
+(define-function eog_image_new_file
+  (c-name "eog_image_new_file")
   (return-type "EogImage*")
   (parameters
-    '("GnomeVFSURI*" "uri")
+    '("GFile*" "file")
   )
 )
 
@@ -460,7 +460,7 @@
 (define-method get_bytes
   (of-object "EogImage")
   (c-name "eog_image_get_bytes")
-  (return-type "GnomeVFSFileSize")
+  (return-type "goffset")
 )
 
 (define-method is_modified
@@ -487,10 +487,10 @@
   (return-type "gpointer")
 )
 
-(define-method get_uri
+(define-method get_file
   (of-object "EogImage")
-  (c-name "eog_image_get_uri")
-  (return-type "GnomeVFSURI*")
+  (c-name "eog_image_get_file")
+  (return-type "GFile*")
 )
 
 (define-method get_uri_for_display

Modified: trunk/bindings/python/eog.override
==============================================================================
--- trunk/bindings/python/eog.override	(original)
+++ trunk/bindings/python/eog.override	Sat Jan  3 11:56:35 2009
@@ -61,7 +61,7 @@
 import gtk.VBox as PyGtkVBox_Type
 import gtk.Table as PyGtkTable_Type
 import gtk.IconView as PyGtkIconView_Type
-import gnomevfs.URI as PyGnomeVFSURI_Type
+import gio.File as PyGFile_Type
 %%
 ignore-glob
   *_get_type

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jan  3 11:56:35 2009
@@ -313,13 +313,11 @@
 fi
 
 if test "x$have_python" != "xno"; then
-	PYGOBJECT_REQUIRED=2.11.5
-	PYGTK_REQUIRED=2.9.7
-	GNOME_PYTHON_REQUIRED=2.18.2
+	PYGOBJECT_REQUIRED=2.15.1
+	PYGTK_REQUIRED=2.13.0
 
 	PKG_CHECK_MODULES([PYGTK], [
 		pygobject-2.0 >= $PYGOBJECT_REQUIRED 
-		gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED
 		pygtk-2.0 >= $PYGTK_REQUIRED],
  		[],
  		[
@@ -338,21 +336,26 @@
 fi
 
 if test "x$have_python" != "xno"; then
+	AC_MSG_CHECKING([for pygobject defs])
+	PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0`
+	AC_MSG_RESULT([$PYGOBJECT_DEFSDIR])
+
 	AC_MSG_CHECKING([for pygtk defs])
 	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 	AC_MSG_RESULT([$PYGTK_DEFSDIR])
 
-	AC_MSG_CHECKING([for pygtk codegen])
-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-	AC_MSG_RESULT([$PYGTK_CODEGEN])
-
-	AC_MSG_CHECKING([for pygtk h2def])
-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-	AC_MSG_RESULT([$PYGTK_H2DEF])
+	AC_MSG_CHECKING([for pygobject codegen])
+	PYGOBJECT_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygobject-2.0`/codegen.py"
+	AC_MSG_RESULT([$PYGOBJECT_CODEGEN])
+
+	AC_MSG_CHECKING([for pygobject h2def])
+	PYGOBJECT_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygobject-2.0`/h2def.py"
+	AC_MSG_RESULT([$PYGOBJECT_H2DEF])
 
+	AC_SUBST([PYGOBJECT_DEFSDIR])
 	AC_SUBST([PYGTK_DEFSDIR])
-	AC_SUBST([PYGTK_CODEGEN])
-	AC_SUBST([PYGTK_H2DEF])
+	AC_SUBST([PYGOBJECT_CODEGEN])
+	AC_SUBST([PYGOBJECT_H2DEF])
 
 	dnl Check for -fno-strict-aliasing
 	FLAGS="-fno-strict-aliasing"