Update

	* PKG-INFO.in: Update

	* configure.in: Require glib/gtk+ 2.6, pango, atk 1.8, export
	PYGTK_[MAJOR,MINOR_MICRO]_VERSION

	* gtk/gtk.defs: Make it build again by removing removed functions

4 files changed, 19 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index b933dddc..6e471494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-22  Johan Dahlin  <johan@gnome.org>
+
+	* PKG-INFO.in: Update
+
+	* configure.in: Require glib/gtk+ 2.6, pango, atk 1.8, export
+	PYGTK_[MAJOR,MINOR_MICRO]_VERSION
+	
+	* gtk/gtk.defs: Make it build again by removing removed functions
+
 2004-12-12  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* codegen/argtypes.py (arg): Add 'GTime' argtype matcher, which is
diff --git a/PKG-INFO.in b/PKG-INFO.in
index 15b8dde3..8767db34 100644
--- a/PKG-INFO.in
+++ b/PKG-INFO.in
@@ -5,8 +5,10 @@ Summary: Python bindings for GTK
 Home-page: http://www.daa.com.au/~james/software/pygtk/
 Author: James Henstridge
 Author-email: james@daa.com.au
+Maintainer: Johan Dahlin
+Maintainer-email: johan@gnome.org
 License: GNU LGPL
-Download-url: ftp://ftp.gtk.org/pub/gtk/python/v2.0/pygtk-@VERSION@.tar.gz
+Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygtk/@PYGTK_MAJOR_VERSION@.@PYGTK_MINOR_VERSION@/pygtk-@VERSION@.tar.gz
 Description: PyGTK allows you to write full featured GTK programs in
         Python.  It is targetted at GTK 2.x, and can be used in
         conjunction with gnome-python to write Gnome applications.
diff --git a/configure.in b/configure.in
index ef53b0da..7026b48b 100644
--- a/configure.in
+++ b/configure.in
@@ -8,18 +8,21 @@ m4_define(pygtk_micro_version, 1)
 m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_version)
 
 dnl versions of packages we require ...
-m4_define(glib_required_version,     2.5.5)
-m4_define(pango_required_version,    1.5.2)
-m4_define(atk_required_version,      1.7.3)
-m4_define(gtk_required_version,      2.5.5)
+m4_define(glib_required_version,     2.6.0)
+m4_define(pango_required_version,    1.8.0)
+m4_define(atk_required_version,      1.8.0)
+m4_define(gtk_required_version,      2.6.0)
 m4_define(libglade_required_version, 2.4.0)
 
 AC_INIT(pygtk, pygtk_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=pygtk])
 
 AC_DEFINE(PYGTK_MAJOR_VERSION, pygtk_major_version, [PyGtk major version])
+AC_SUBST(PYGTK_MAJOR_VERSION, pygtk_major_version)
 AC_DEFINE(PYGTK_MINOR_VERSION, pygtk_minor_version, [PyGtk minor version])
+AC_SUBST(PYGTK_MINOR_VERSION, pygtk_minor_version)
 AC_DEFINE(PYGTK_MICRO_VERSION, pygtk_micro_version, [PyGtk macro version])
+AC_SUBST(PYGTK_MICRO_VERSION, pygtk_micro_version)
 
 AC_CONFIG_SRCDIR([gtk/gtkmodule.c])
 AM_CONFIG_HEADER(config.h)
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index f4d8cecd..15d6ed6a 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -1047,7 +1047,6 @@
 )
 
 
-
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkalignment.h
 
 (define-function gtk_alignment_get_type
@@ -2182,27 +2181,6 @@
   )
 )
 
-(define-method set_value
-  (of-object "GtkCellView")
-  (c-name "gtk_cell_view_set_value")
-  (return-type "none")
-  (parameters
-    '("GtkCellRenderer*" "renderer")
-    '("gchar*" "property")
-    '("GValue*" "value")
-  )
-)
-
-(define-method set_values
-  (of-object "GtkCellView")
-  (c-name "gtk_cell_view_set_values")
-  (return-type "none")
-  (parameters
-    '("GtkCellRenderer*" "renderer")
-  )
-  (varargs #t)
-)
-
 (define-method set_model
   (of-object "GtkCellView")
   (c-name "gtk_cell_view_set_model")