From d33dd2f5650048165016240ba5f2cc32aafe1baa Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Mon, 20 Jun 2005 21:39:34 +0000
Subject: [PATCH] gst/: commented-out deprecated code, compiles at last, and
 works for pipeline creation and state change

Original commit message from CVS:
* gst/arg-types.py:
* gst/common.h:
* gst/gst-argtypes.c:
* gst/gst-types.defs:
* gst/gst.defs:
* gst/gst.override:
* gst/gstelement.override:
* gst/gstmodule.c:
* gst/gstpad.override:
* gst/gststructure.override:
commented-out deprecated code,
compiles at last, and works for pipeline creation and state change
* configure.ac:
updated requirement of GStream (0.9.0), pygtk (2.6.1)
bumped version number (0.9.0.1)
---
 ChangeLog                 |  19 ++
 configure.ac              |   8 +-
 gst/arg-types.py          |   2 +-
 gst/common.h              |   4 +-
 gst/gst-argtypes.c        |  78 ++++----
 gst/gst-types.defs        |  13 +-
 gst/gst.defs              | 384 +++++++++++++++++++-------------------
 gst/gst.override          |   6 +-
 gst/gstelement.override   | 114 +++++------
 gst/gstmodule.c           |  20 +-
 gst/gstpad.override       |  65 ++++---
 gst/gststructure.override |   2 +-
 12 files changed, 375 insertions(+), 340 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd9dcf4729..673ddb0364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-06-20  Edward Hervey  <edward@fluendo.com>
+
+	* gst/arg-types.py: 
+	* gst/common.h:
+	* gst/gst-argtypes.c:
+	* gst/gst-types.defs:
+	* gst/gst.defs:
+	* gst/gst.override:
+	* gst/gstelement.override:
+	* gst/gstmodule.c:
+	* gst/gstpad.override:
+	* gst/gststructure.override:
+	commented-out deprecated code,
+	compiles at last, and works for pipeline creation and state change
+
+	* configure.ac:
+	updated requirement of GStream (0.9.0), pygtk (2.6.1)
+	bumped version number (0.9.0.1)
+
 2005-06-17  Edward Hervey  <bilboed@bilboed.com>
 
     * Backport of bugfixes/new features from 0.8 branch to HEAD
diff --git a/configure.ac b/configure.ac
index b35a0d4e47..3c3813de9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
 AM_MAINTAINER_MODE
                                                                                 
 dnl when going to/from release please set the nano (fourth number) right !
-AS_VERSION(gst-python, PYGST_VERSION, 0, 8, 1, 1, GST_CVS="no", GST_CVS="yes")
+AS_VERSION(gst-python, PYGST_VERSION, 0, 9, 0, 1, GST_CVS="no", GST_CVS="yes")
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
@@ -23,10 +23,10 @@ dnl Add parameters for aclocal
 ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS"
 
 dnl required versions of other packages
-AC_SUBST(PYGTK_REQ, 2.4.0)
+AC_SUBST(PYGTK_REQ, 2.6.1)
 AC_SUBST(GLIB_REQ,  2.0.0)
 AC_SUBST(GTK_REQ,   2.0.0)
-AC_SUBST(GST_REQ,   0.8.9)
+AC_SUBST(GST_REQ,   0.9.0)
 
 
 AC_DISABLE_STATIC
@@ -52,7 +52,7 @@ fi
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
 dnl check for GStreamer
-GST_MAJORMINOR=0.8
+GST_MAJORMINOR=0.9
 AC_SUBST(GST_MAJORMINOR)
 PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ)
 AC_SUBST(GST_CFLAGS)
diff --git a/gst/arg-types.py b/gst/arg-types.py
index 36d3c21924..f6b9d54820 100644
--- a/gst/arg-types.py
+++ b/gst/arg-types.py
@@ -114,7 +114,7 @@ class GstCapsArg(ArgType):
                   '    else\n'
                   '  ' + before)
     after = ('    if (%(name)s && %(name)s_is_copy)\n'
-             '        gst_caps_free (%(name)s);\n')
+             '        gst_caps_unref (%(name)s);\n')
 
     def write_param(self, ptype, pname, pdflt, pnull, info):
         if ptype == 'const-GstCaps*':
diff --git a/gst/common.h b/gst/common.h
index 75bd2e9861..83f1ed6b4d 100644
--- a/gst/common.h
+++ b/gst/common.h
@@ -45,8 +45,8 @@ typedef struct {
 } PyGstCustomNotify;
 
 /* from gst-types.c */
-gboolean pygst_data_from_pyobject(PyObject *object, GstData **data);
-PyObject *pygst_data_to_pyobject(GstData *data);
+/* gboolean pygst_data_from_pyobject(PyObject *object, GstData **data); */
+/* PyObject *pygst_data_to_pyobject(GstData *data); */
 GstCaps *pygst_caps_from_pyobject (PyObject *object, gboolean *copy);
 
 
diff --git a/gst/gst-argtypes.c b/gst/gst-argtypes.c
index d78ce426d4..e24a716933 100644
--- a/gst/gst-argtypes.c
+++ b/gst/gst-argtypes.c
@@ -26,44 +26,44 @@
 #include <gst/gst.h>
 #include "common.h"
 
-gboolean
-pygst_data_from_pyobject(PyObject *object, GstData **data)
-{
-  if (pyg_boxed_check(object, GST_TYPE_DATA)) {
-    *data = pyg_boxed_get(object, GstData);
-    return TRUE;
-  } else if (pyg_boxed_check(object, GST_TYPE_BUFFER)) {
-    *data = GST_DATA (pyg_boxed_get(object, GstBuffer));
-    return TRUE;
-  } else if (pyg_boxed_check(object, GST_TYPE_EVENT)) {
-    *data = GST_DATA (pyg_boxed_get(object, GstEvent));
-    return TRUE;
-  }
+/* gboolean */
+/* pygst_data_from_pyobject(PyObject *object, GstData **data) */
+/* { */
+/*   if (pyg_boxed_check(object, GST_TYPE_DATA)) { */
+/*     *data = pyg_boxed_get(object, GstData); */
+/*     return TRUE; */
+/*   } else if (pyg_boxed_check(object, GST_TYPE_BUFFER)) { */
+/*     *data = GST_DATA (pyg_boxed_get(object, GstBuffer)); */
+/*     return TRUE; */
+/*   } else if (pyg_boxed_check(object, GST_TYPE_EVENT)) { */
+/*     *data = GST_DATA (pyg_boxed_get(object, GstEvent)); */
+/*     return TRUE; */
+/*   } */
   
-  PyErr_Clear();
-  PyErr_SetString(PyExc_TypeError, "could not convert to GstData");
-  return FALSE;
-}
+/*   PyErr_Clear(); */
+/*   PyErr_SetString(PyExc_TypeError, "could not convert to GstData"); */
+/*   return FALSE; */
+/* } */
 
-static PyObject *
-PyGstData_from_value(const GValue *value)
-{
-  GstData *data = (GstData *)g_value_get_boxed(value);
+/* static PyObject * */
+/* PyGstData_from_value(const GValue *value) */
+/* { */
+/*   GstData *data = (GstData *)g_value_get_boxed(value); */
 
-  return pyg_boxed_new(GST_TYPE_DATA, data, TRUE, TRUE);
-}
+/*   return pyg_boxed_new(GST_TYPE_DATA, data, TRUE, TRUE); */
+/* } */
 
-static int
-PyGstData_to_value(GValue *value, PyObject *object)
-{
-  GstData* data;
+/* static int */
+/* PyGstData_to_value(GValue *value, PyObject *object) */
+/* { */
+/*   GstData* data; */
 
-  if (!pygst_data_from_pyobject(object, &data))
-    return -1;
+/*   if (!pygst_data_from_pyobject(object, &data)) */
+/*     return -1; */
   
-  g_value_set_boxed(value, data);
-  return 0;
-}
+/*   g_value_set_boxed(value, data); */
+/*   return 0; */
+/* } */
 
 /* This function will return a copy, unless the following is all TRUE:
  * - The given PyObject contains a GstCaps already
@@ -103,10 +103,10 @@ pygst_caps_from_pyobject (PyObject *object, gboolean *copy)
   return NULL;
 }
 
-void
-_pygst_register_boxed_types(PyObject *moddict)
-{
-    pyg_register_boxed_custom(GST_TYPE_DATA,
-			      PyGstData_from_value,
-			      PyGstData_to_value);
-}
+/* void */
+/* _pygst_register_boxed_types(PyObject *moddict) */
+/* { */
+/*     pyg_register_boxed_custom(GST_TYPE_DATA, */
+/* 			      PyGstData_from_value, */
+/* 			      PyGstData_to_value); */
+/* } */
diff --git a/gst/gst-types.defs b/gst/gst-types.defs
index ffb5bdfe67..63f96f07f9 100644
--- a/gst/gst-types.defs
+++ b/gst/gst-types.defs
@@ -1,6 +1,7 @@
 ;; -*- scheme -*-
 
 ; object definitions ...
+
 (define-object Object
   (in-module "Gst")
   (parent "GObject")
@@ -141,9 +142,15 @@
   (gtype-id "GST_TYPE_XML")
 )
 
-::
-:: MiniObject types
-::
+;;
+;; MiniObject types
+;;
+
+(define-boxed MiniObject
+  (in-module "Gst")
+  (c-name "GstMiniObject")
+  (gtype-id "GST_TYPE_MINI_OBJECT")
+)
 
 (define-object Buffer
   (in-module "Gst")
diff --git a/gst/gst.defs b/gst/gst.defs
index 2b1b9b754a..30474aee33 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -1,7 +1,7 @@
 ;; -*- scheme -*-
 
 (include "gst-extrafuncs.defs")
-{include "gst-types.defs")
+(include "gst-types.defs")
 
 
 ;; From ../gstreamer/gst/cothreads.h
@@ -132,7 +132,7 @@
 
 ;; From ../gstreamer/gst/gst.h
 
-(define-function gst_init
+(define-function init
   (c-name "gst_init")
   (return-type "none")
   (parameters
@@ -141,7 +141,7 @@
   )
 )
 
-(define-function gst_init_check
+(define-function init_check
   (c-name "gst_init_check")
   (return-type "gboolean")
   (parameters
@@ -150,7 +150,7 @@
   )
 )
 
-(define-function gst_init_with_popt_table
+(define-function init_with_popt_table
   (c-name "gst_init_with_popt_table")
   (return-type "none")
   (parameters
@@ -160,7 +160,7 @@
   )
 )
 
-(define-function gst_init_check_with_popt_table
+(define-function init_check_with_popt_table
   (c-name "gst_init_check_with_popt_table")
   (return-type "gboolean")
   (parameters
@@ -170,7 +170,7 @@
   )
 )
 
-(define-function gst_init_get_popt_table
+(define-function init_get_popt_table
   (c-name "gst_init_get_popt_table")
   (return-type "const-GstPoptOption*")
 )
@@ -277,7 +277,7 @@
 
 ;; From ../gstreamer/gst/gstbuffer.h
 
-(define-function gst_buffer_get_type
+(define-function buffer_get_type
   (c-name "gst_buffer_get_type")
   (return-type "GType")
 )
@@ -288,7 +288,7 @@
   (return-type "GstBuffer*")
 )
 
-(define-function gst_buffer_new_and_alloc
+(define-function buffer_new_and_alloc
   (c-name "gst_buffer_new_and_alloc")
   (return-type "GstBuffer*")
   (parameters
@@ -444,22 +444,22 @@
 
 ;; From ../gstreamer/gst/gstcaps.h
 
-(define-function gst_caps_get_type
+(define-function caps_get_type
   (c-name "gst_caps_get_type")
   (return-type "GType")
 )
 
-(define-function gst_caps_new_empty
+(define-function caps_new_empty
   (c-name "gst_caps_new_empty")
   (return-type "GstCaps*")
 )
 
-(define-function gst_caps_new_any
+(define-function caps_new_any
   (c-name "gst_caps_new_any")
   (return-type "GstCaps*")
 )
 
-(define-function gst_caps_new_simple
+(define-function caps_new_simple
   (c-name "gst_caps_new_simple")
   (return-type "GstCaps*")
   (parameters
@@ -469,7 +469,7 @@
   (varargs #t)
 )
 
-(define-function gst_caps_new_full
+(define-function caps_new_full
   (c-name "gst_caps_new_full")
   (return-type "GstCaps*")
   (parameters
@@ -478,7 +478,7 @@
   (varargs #t)
 )
 
-(define-function gst_caps_new_full_valist
+(define-function caps_new_full_valist
   (c-name "gst_caps_new_full_valist")
   (return-type "GstCaps*")
   (parameters
@@ -672,7 +672,7 @@
   )
 )
 
-(define-function gst_caps_load_thyself
+(define-function caps_load_thyself
   (c-name "gst_caps_load_thyself")
   (return-type "GstCaps*")
   (parameters
@@ -680,7 +680,7 @@
   )
 )
 
-(define-function gst_caps_replace
+(define-function caps_replace
   (c-name "gst_caps_replace")
   (return-type "none")
   (parameters
@@ -695,7 +695,7 @@
   (return-type "gchar*")
 )
 
-(define-function gst_caps_from_string
+(define-function caps_from_string
   (c-name "gst_caps_from_string")
   (return-type "GstCaps*")
   (parameters
@@ -782,7 +782,7 @@
   (return-type "none")
 )
 
-(define-function gst_clock_id_compare_func
+(define-function clock_id_compare_func
   (c-name "gst_clock_id_compare_func")
   (return-type "gint")
   (parameters
@@ -1159,12 +1159,12 @@
 
 ;; From ../gstreamer/gst/gstelementfactory.h
 
-(define-function gst_element_factory_get_type
+(define-function element_factory_get_type
   (c-name "gst_element_factory_get_type")
   (return-type "GType")
 )
 
-(define-function gst_element_factory_find
+(define-function element_factory_find
   (c-name "gst_element_factory_find")
   (return-type "GstElementFactory*")
   (parameters
@@ -1235,7 +1235,7 @@
   )
 )
 
-(define-function gst_element_factory_make
+(define-function element_factory_make
   (c-name "gst_element_factory_make")
   (return-type "GstElement*")
   (parameters
@@ -1244,7 +1244,7 @@
   )
 )
 
-(define-function gst_element_register
+(define-function element_register
   (c-name "gst_element_register")
   (return-type "gboolean")
   (parameters
@@ -1533,7 +1533,7 @@
   (return-type "GType")
 )
 
-(define-function gst_error_get_message
+(define-function error_get_message
   (c-name "gst_error_get_message")
   (return-type "gchar*")
   (parameters
@@ -1542,22 +1542,22 @@
   )
 )
 
-(define-function gst_stream_error_quark
+(define-function stream_error_quark
   (c-name "gst_stream_error_quark")
   (return-type "GQuark")
 )
 
-(define-function gst_core_error_quark
+(define-function core_error_quark
   (c-name "gst_core_error_quark")
   (return-type "GQuark")
 )
 
-(define-function gst_resource_error_quark
+(define-function resource_error_quark
   (c-name "gst_resource_error_quark")
   (return-type "GQuark")
 )
 
-(define-function gst_library_error_quark
+(define-function library_error_quark
   (c-name "gst_library_error_quark")
   (return-type "GQuark")
 )
@@ -1589,7 +1589,7 @@
   )
 )
 
-(define-function gst_event_new_seek
+(define-function event_new_seek
   (c-name "gst_event_new_seek")
   (return-type "GstEvent*")
   (parameters
@@ -1598,7 +1598,7 @@
   )
 )
 
-(define-function gst_event_new_segment_seek
+(define-function event_new_segment_seek
   (c-name "gst_event_new_segment_seek")
   (return-type "GstEvent*")
   (parameters
@@ -1608,7 +1608,7 @@
   )
 )
 
-(define-function gst_event_new_size
+(define-function event_new_size
   (c-name "gst_event_new_size")
   (return-type "GstEvent*")
   (parameters
@@ -1617,7 +1617,7 @@
   )
 )
 
-(define-function gst_event_new_discontinuous
+(define-function event_new_discontinuous
   (c-name "gst_event_new_discontinuous")
   (return-type "GstEvent*")
   (parameters
@@ -1627,7 +1627,7 @@
   (varargs #t)
 )
 
-(define-function gst_event_new_discontinuous_valist
+(define-function event_new_discontinuous_valist
   (c-name "gst_event_new_discontinuous_valist")
   (return-type "GstEvent*")
   (parameters
@@ -1648,7 +1648,7 @@
   )
 )
 
-(define-function gst_event_new_flush
+(define-function event_new_flush
   (c-name "gst_event_new_flush")
   (return-type "GstEvent*")
   (parameters
@@ -1660,7 +1660,7 @@
 
 ;; From ../gstreamer/gst/gstfilter.h
 
-(define-function gst_filter_run
+(define-function filter_run
   (c-name "gst_filter_run")
   (return-type "GList*")
   (parameters
@@ -1675,7 +1675,7 @@
 
 ;; From ../gstreamer/gst/gstformat.h
 
-(define-function gst_format_register
+(define-function format_register
   (c-name "gst_format_register")
   (return-type "GstFormat")
   (parameters
@@ -1684,7 +1684,7 @@
   )
 )
 
-(define-function gst_format_get_by_nick
+(define-function format_get_by_nick
   (c-name "gst_format_get_by_nick")
   (return-type "GstFormat")
   (parameters
@@ -1707,7 +1707,7 @@
   (return-type "const-GstFormatDefinition*")
 )
 
-(define-function gst_format_iterate_definitions
+(define-function format_iterate_definitions
   (c-name "gst_format_iterate_definitions")
   (return-type "GstIterator*")
 )
@@ -1943,7 +1943,7 @@
   (return-type "none")
 )
 
-(define-function gst_index_factory_find
+(define-function index_factory_find
   (c-name "gst_index_factory_find")
   (return-type "GstIndexFactory*")
   (parameters
@@ -1957,7 +1957,7 @@
   (return-type "GstIndex*")
 )
 
-(define-function gst_index_factory_make
+(define-function index_factory_make
   (c-name "gst_index_factory_make")
   (return-type "GstIndex*")
   (parameters
@@ -1969,7 +1969,7 @@
 
 ;; From ../gstreamer/gst/gstinfo.h
 
-(define-function gst_debug_log
+(define-function debug_log
   (c-name "gst_debug_log")
   (return-type "none")
   (parameters
@@ -1984,7 +1984,7 @@
   (varargs #t)
 )
 
-(define-function gst_debug_log_valist
+(define-function debug_log_valist
   (c-name "gst_debug_log_valist")
   (return-type "none")
   (parameters
@@ -2005,7 +2005,7 @@
   (return-type "const-gchar*")
 )
 
-(define-function gst_debug_log_default
+(define-function debug_log_default
   (c-name "gst_debug_log_default")
   (return-type "none")
   (parameters
@@ -2026,7 +2026,7 @@
   (return-type "const-gchar*")
 )
 
-(define-function gst_debug_add_log_function
+(define-function debug_add_log_function
   (c-name "gst_debug_add_log_function")
   (return-type "none")
   (parameters
@@ -2035,7 +2035,7 @@
   )
 )
 
-(define-function gst_debug_remove_log_function
+(define-function debug_remove_log_function
   (c-name "gst_debug_remove_log_function")
   (return-type "guint")
   (parameters
@@ -2043,7 +2043,7 @@
   )
 )
 
-(define-function gst_debug_remove_log_function_by_data
+(define-function debug_remove_log_function_by_data
   (c-name "gst_debug_remove_log_function_by_data")
   (return-type "guint")
   (parameters
@@ -2051,7 +2051,7 @@
   )
 )
 
-(define-function gst_debug_set_active
+(define-function debug_set_active
   (c-name "gst_debug_set_active")
   (return-type "none")
   (parameters
@@ -2059,12 +2059,12 @@
   )
 )
 
-(define-function gst_debug_is_active
+(define-function debug_is_active
   (c-name "gst_debug_is_active")
   (return-type "gboolean")
 )
 
-(define-function gst_debug_set_colored
+(define-function debug_set_colored
   (c-name "gst_debug_set_colored")
   (return-type "none")
   (parameters
@@ -2072,12 +2072,12 @@
   )
 )
 
-(define-function gst_debug_is_colored
+(define-function debug_is_colored
   (c-name "gst_debug_is_colored")
   (return-type "gboolean")
 )
 
-(define-function gst_debug_set_default_threshold
+(define-function debug_set_default_threshold
   (c-name "gst_debug_set_default_threshold")
   (return-type "none")
   (parameters
@@ -2085,12 +2085,12 @@
   )
 )
 
-(define-function gst_debug_get_default_threshold
+(define-function debug_get_default_threshold
   (c-name "gst_debug_get_default_threshold")
   (return-type "GstDebugLevel")
 )
 
-(define-function gst_debug_set_threshold_for_name
+(define-function debug_set_threshold_for_name
   (c-name "gst_debug_set_threshold_for_name")
   (return-type "none")
   (parameters
@@ -2099,7 +2099,7 @@
   )
 )
 
-(define-function gst_debug_unset_threshold_for_name
+(define-function debug_unset_threshold_for_name
   (c-name "gst_debug_unset_threshold_for_name")
   (return-type "none")
   (parameters
@@ -2152,12 +2152,12 @@
   (return-type "const-gchar*")
 )
 
-(define-function gst_debug_get_all_categories
+(define-function debug_get_all_categories
   (c-name "gst_debug_get_all_categories")
   (return-type "GSList*")
 )
 
-(define-function gst_debug_construct_term_color
+(define-function debug_construct_term_color
   (c-name "gst_debug_construct_term_color")
   (return-type "gchar*")
   (parameters
@@ -2165,7 +2165,7 @@
   )
 )
 
-(define-function gst_debug_remove_log_function
+(define-function debug_remove_log_function
   (c-name "gst_debug_remove_log_function")
   (return-type "guint")
   (parameters
@@ -2173,7 +2173,7 @@
   )
 )
 
-(define-function gst_debug_remove_log_function_by_data
+(define-function debug_remove_log_function_by_data
   (c-name "gst_debug_remove_log_function_by_data")
   (return-type "guint")
   (parameters
@@ -2199,7 +2199,7 @@
   )
 )
 
-(define-function gst_implements_interface_cast
+(define-function implements_interface_cast
   (c-name "gst_implements_interface_cast")
   (return-type "gpointer")
   (parameters
@@ -2208,7 +2208,7 @@
   )
 )
 
-(define-function gst_implements_interface_check
+(define-function implements_interface_check
   (c-name "gst_implements_interface_check")
   (return-type "gboolean")
   (parameters
@@ -2236,7 +2236,7 @@
   )
 )
 
-(define-function gst_iterator_new_list
+(define-function iterator_new_list
   (c-name "gst_iterator_new_list")
   (return-type "GstIterator*")
   (parameters
@@ -2380,7 +2380,7 @@
   (return-type "GType")
 )
 
-(define-function gst_message_new_eos
+(define-function message_new_eos
   (c-name "gst_message_new_eos")
   (return-type "GstMessage*")
   (parameters
@@ -2388,7 +2388,7 @@
   )
 )
 
-(define-function gst_message_new_error
+(define-function message_new_error
   (c-name "gst_message_new_error")
   (return-type "GstMessage*")
   (parameters
@@ -2398,7 +2398,7 @@
   )
 )
 
-(define-function gst_message_new_warning
+(define-function message_new_warning
   (c-name "gst_message_new_warning")
   (return-type "GstMessage*")
   (parameters
@@ -2408,7 +2408,7 @@
   )
 )
 
-(define-function gst_message_new_tag
+(define-function message_new_tag
   (c-name "gst_message_new_tag")
   (return-type "GstMessage*")
   (parameters
@@ -2417,7 +2417,7 @@
   )
 )
 
-(define-function gst_message_new_state_changed
+(define-function message_new_state_changed
   (c-name "gst_message_new_state_changed")
   (return-type "GstMessage*")
   (parameters
@@ -2427,7 +2427,7 @@
   )
 )
 
-(define-function gst_message_new_application
+(define-function message_new_application
   (c-name "gst_message_new_application")
   (return-type "GstMessage*")
   (parameters
@@ -2475,7 +2475,7 @@
 )
 
 (define-method get_structure
-  (of-object "GstMessage")
+  (of-object "GstMessage*")
   (c-name "gst_message_get_structure")
   (return-type "const-GstStructure*")
 )
@@ -2528,7 +2528,7 @@
   (return-type "none")
 )
 
-(define-function gst_mini_object_replace
+(define-function mini_object_replace
   (c-name "gst_mini_object_replace")
   (return-type "none")
   (parameters
@@ -2537,7 +2537,7 @@
   )
 )
 
-(define-function gst_param_spec_mini_object
+(define-function param_spec_mini_object
   (c-name "gst_param_spec_mini_object")
   (return-type "GParamSpec*")
   (parameters
@@ -2549,7 +2549,7 @@
   )
 )
 
-(define-function gst_value_set_mini_object
+(define-function value_set_mini_object
   (c-name "gst_value_set_mini_object")
   (return-type "none")
   (parameters
@@ -2558,7 +2558,7 @@
   )
 )
 
-(define-function gst_value_take_mini_object
+(define-function value_take_mini_object
   (c-name "gst_value_take_mini_object")
   (return-type "none")
   (parameters
@@ -2567,7 +2567,7 @@
   )
 )
 
-(define-function gst_value_get_mini_object
+(define-function value_get_mini_object
   (c-name "gst_value_get_mini_object")
   (return-type "GstMiniObject*")
   (parameters
@@ -2635,7 +2635,7 @@
   (return-type "none")
 )
 
-(define-function gst_object_default_deep_notify
+(define-function object_default_deep_notify
   (c-name "gst_object_default_deep_notify")
   (return-type "none")
   (parameters
@@ -2664,7 +2664,7 @@
   (return-type "none")
 )
 
-(define-function gst_object_replace
+(define-function object_replace
   (c-name "gst_object_replace")
   (return-type "none")
   (parameters
@@ -2679,7 +2679,7 @@
   (return-type "gchar*")
 )
 
-(define-function gst_object_check_uniqueness
+(define-function object_check_uniqueness
   (c-name "gst_object_check_uniqueness")
   (return-type "gboolean")
   (parameters
@@ -2706,7 +2706,7 @@
   )
 )
 
-(define-function gst_class_signal_connect
+(define-function class_signal_connect
   (c-name "gst_class_signal_connect")
   (return-type "guint")
   (parameters
@@ -2717,7 +2717,7 @@
   )
 )
 
-(define-function gst_class_signal_emit_by_name
+(define-function class_signal_emit_by_name
   (c-name "gst_class_signal_emit_by_name")
   (return-type "none")
   (parameters
@@ -2746,7 +2746,7 @@
   )
 )
 
-(define-function gst_pad_new_from_template
+(define-function pad_new_from_template
   (c-name "gst_pad_new_from_template")
   (return-type "GstPad*")
   (parameters
@@ -3237,7 +3237,7 @@
   )
 )
 
-(define-function gst_pad_load_and_link
+(define-function pad_load_and_link
   (c-name "gst_pad_load_and_link")
   (return-type "none")
   (parameters
@@ -3285,12 +3285,12 @@
 
 ;; From ../gstreamer/gst/gstparse.h
 
-(define-function gst_parse_error_quark
+(define-function parse_error_quark
   (c-name "gst_parse_error_quark")
   (return-type "GQuark")
 )
 
-(define-function gst_parse_launch
+(define-function parse_launch
   (c-name "gst_parse_launch")
   (return-type "GstElement*")
   (parameters
@@ -3299,7 +3299,7 @@
   )
 )
 
-(define-function gst_parse_launchv
+(define-function parse_launchv
   (c-name "gst_parse_launchv")
   (return-type "GstElement*")
   (parameters
@@ -3372,7 +3372,7 @@
 
 ;; From ../gstreamer/gst/gstplugin.h
 
-(define-function gst_plugin_error_quark
+(define-function plugin_error_quark
   (c-name "gst_plugin_error_quark")
   (return-type "GQuark")
 )
@@ -3447,7 +3447,7 @@
   )
 )
 
-(define-function gst_plugin_list_feature_filter
+(define-function plugin_list_feature_filter
   (c-name "gst_plugin_list_feature_filter")
   (return-type "GList*")
   (parameters
@@ -3483,7 +3483,7 @@
   )
 )
 
-(define-function gst_plugin_check_file
+(define-function plugin_check_file
   (c-name "gst_plugin_check_file")
   (return-type "gboolean")
   (parameters
@@ -3492,7 +3492,7 @@
   )
 )
 
-(define-function gst_plugin_load_file
+(define-function plugin_load_file
   (c-name "gst_plugin_load_file")
   (return-type "GstPlugin*")
   (parameters
@@ -3516,7 +3516,7 @@
   )
 )
 
-(define-function gst_plugin_load
+(define-function plugin_load
   (c-name "gst_plugin_load")
   (return-type "gboolean")
   (parameters
@@ -3619,7 +3619,7 @@
   )
 )
 
-(define-function gst_probe_dispatcher_new
+(define-function probe_dispatcher_new
   (c-name "gst_probe_dispatcher_new")
   (is-constructor-of "GstProbeDispatcher")
   (return-type "GstProbeDispatcher*")
@@ -3682,7 +3682,7 @@
   (return-type "GType")
 )
 
-(define-function gst_query_type_register
+(define-function query_type_register
   (c-name "gst_query_type_register")
   (return-type "GstQueryType")
   (parameters
@@ -3691,7 +3691,7 @@
   )
 )
 
-(define-function gst_query_type_get_by_nick
+(define-function query_type_get_by_nick
   (c-name "gst_query_type_get_by_nick")
   (return-type "GstQueryType")
   (parameters
@@ -3714,12 +3714,12 @@
   (return-type "const-GstQueryTypeDefinition*")
 )
 
-(define-function gst_query_type_iterate_definitions
+(define-function query_type_iterate_definitions
   (c-name "gst_query_type_iterate_definitions")
   (return-type "GstIterator*")
 )
 
-(define-function gst_query_new_position
+(define-function query_new_position
   (c-name "gst_query_new_position")
   (return-type "GstQuery*")
   (parameters
@@ -3749,7 +3749,7 @@
   )
 )
 
-(define-function gst_query_new_convert
+(define-function query_new_convert
   (c-name "gst_query_new_convert")
   (return-type "GstQuery*")
   (parameters
@@ -3783,7 +3783,7 @@
   )
 )
 
-(define-function gst_query_new_application
+(define-function query_new_application
   (c-name "gst_query_new_application")
   (return-type "GstQuery*")
   (parameters
@@ -4004,7 +4004,7 @@
 
 ;; From ../gstreamer/gst/gstregistrypool.h
 
-(define-function gst_registry_pool_list
+(define-function registry_pool_list
   (c-name "gst_registry_pool_list")
   (return-type "GList*")
 )
@@ -4024,7 +4024,7 @@
   (return-type "none")
 )
 
-(define-function gst_registry_pool_add_plugin
+(define-function registry_pool_add_plugin
   (c-name "gst_registry_pool_add_plugin")
   (return-type "none")
   (parameters
@@ -4032,12 +4032,12 @@
   )
 )
 
-(define-function gst_registry_pool_load_all
+(define-function registry_pool_load_all
   (c-name "gst_registry_pool_load_all")
   (return-type "none")
 )
 
-(define-function gst_registry_pool_plugin_filter
+(define-function registry_pool_plugin_filter
   (c-name "gst_registry_pool_plugin_filter")
   (return-type "GList*")
   (parameters
@@ -4047,7 +4047,7 @@
   )
 )
 
-(define-function gst_registry_pool_feature_filter
+(define-function registry_pool_feature_filter
   (c-name "gst_registry_pool_feature_filter")
   (return-type "GList*")
   (parameters
@@ -4057,12 +4057,12 @@
   )
 )
 
-(define-function gst_registry_pool_plugin_list
+(define-function registry_pool_plugin_list
   (c-name "gst_registry_pool_plugin_list")
   (return-type "GList*")
 )
 
-(define-function gst_registry_pool_feature_list
+(define-function registry_pool_feature_list
   (c-name "gst_registry_pool_feature_list")
   (return-type "GList*")
   (parameters
@@ -4070,7 +4070,7 @@
   )
 )
 
-(define-function gst_registry_pool_find_plugin
+(define-function registry_pool_find_plugin
   (c-name "gst_registry_pool_find_plugin")
   (return-type "GstPlugin*")
   (parameters
@@ -4078,7 +4078,7 @@
   )
 )
 
-(define-function gst_registry_pool_find_feature
+(define-function registry_pool_find_feature
   (c-name "gst_registry_pool_find_feature")
   (return-type "GstPluginFeature*")
   (parameters
@@ -4087,7 +4087,7 @@
   )
 )
 
-(define-function gst_registry_pool_get_prefered
+(define-function registry_pool_get_prefered
   (c-name "gst_registry_pool_get_prefered")
   (return-type "GstRegistry*")
   (parameters
@@ -4131,7 +4131,7 @@
   (return-type "GType")
 )
 
-(define-function gst_scheduler_register
+(define-function scheduler_register
   (c-name "gst_scheduler_register")
   (return-type "gboolean")
   (parameters
@@ -4159,7 +4159,7 @@
   (return-type "none")
 )
 
-(define-function gst_scheduler_factory_find
+(define-function scheduler_factory_find
   (c-name "gst_scheduler_factory_find")
   (return-type "GstSchedulerFactory*")
   (parameters
@@ -4176,7 +4176,7 @@
   )
 )
 
-(define-function gst_scheduler_factory_make
+(define-function scheduler_factory_make
   (c-name "gst_scheduler_factory_make")
   (return-type "GstScheduler*")
   (parameters
@@ -4185,7 +4185,7 @@
   )
 )
 
-(define-function gst_scheduler_factory_set_default_name
+(define-function scheduler_factory_set_default_name
   (c-name "gst_scheduler_factory_set_default_name")
   (return-type "none")
   (parameters
@@ -4193,7 +4193,7 @@
   )
 )
 
-(define-function gst_scheduler_factory_get_default_name
+(define-function scheduler_factory_get_default_name
   (c-name "gst_scheduler_factory_get_default_name")
   (return-type "const-gchar*")
 )
@@ -4236,7 +4236,7 @@
   (varargs #t)
 )
 
-(define-function gst_structure_new_valist
+(define-function structure_new_valist
   (c-name "gst_structure_new_valist")
   (return-type "GstStructure*")
   (parameters
@@ -4490,7 +4490,7 @@
   (return-type "gchar*")
 )
 
-(define-function gst_structure_from_string
+(define-function structure_from_string
   (c-name "gst_structure_from_string")
   (return-type "GstStructure*")
   (parameters
@@ -4499,7 +4499,7 @@
   )
 )
 
-(define-function gst_caps_structure_fixate_field_nearest_int
+(define-function caps_structure_fixate_field_nearest_int
   (c-name "gst_caps_structure_fixate_field_nearest_int")
   (return-type "gboolean")
   (parameters
@@ -4509,7 +4509,7 @@
   )
 )
 
-(define-function gst_caps_structure_fixate_field_nearest_double
+(define-function caps_structure_fixate_field_nearest_double
   (c-name "gst_caps_structure_fixate_field_nearest_double")
   (return-type "gboolean")
   (parameters
@@ -4528,7 +4528,7 @@
   (return-type "GType")
 )
 
-(define-function gst_system_clock_obtain
+(define-function system_clock_obtain
   (c-name "gst_system_clock_obtain")
   (return-type "GstClock*")
 )
@@ -4542,7 +4542,7 @@
   (return-type "GType")
 )
 
-(define-function gst_tag_register
+(define-function tag_register
   (c-name "gst_tag_register")
   (return-type "none")
   (parameters
@@ -4555,7 +4555,7 @@
   )
 )
 
-(define-function gst_tag_merge_use_first
+(define-function tag_merge_use_first
   (c-name "gst_tag_merge_use_first")
   (return-type "none")
   (parameters
@@ -4564,7 +4564,7 @@
   )
 )
 
-(define-function gst_tag_merge_strings_with_comma
+(define-function tag_merge_strings_with_comma
   (c-name "gst_tag_merge_strings_with_comma")
   (return-type "none")
   (parameters
@@ -4573,7 +4573,7 @@
   )
 )
 
-(define-function gst_tag_exists
+(define-function tag_exists
   (c-name "gst_tag_exists")
   (return-type "gboolean")
   (parameters
@@ -4589,7 +4589,7 @@
   )
 )
 
-(define-function gst_tag_get_nick
+(define-function tag_get_nick
   (c-name "gst_tag_get_nick")
   (return-type "const-gchar*")
   (parameters
@@ -4597,7 +4597,7 @@
   )
 )
 
-(define-function gst_tag_get_description
+(define-function tag_get_description
   (c-name "gst_tag_get_description")
   (return-type "const-gchar*")
   (parameters
@@ -4605,7 +4605,7 @@
   )
 )
 
-(define-function gst_tag_get_flag
+(define-function tag_get_flag
   (c-name "gst_tag_get_flag")
   (return-type "GstTagFlag")
   (parameters
@@ -4613,7 +4613,7 @@
   )
 )
 
-(define-function gst_tag_is_fixed
+(define-function tag_is_fixed
   (c-name "gst_tag_is_fixed")
   (return-type "gboolean")
   (parameters
@@ -4627,7 +4627,7 @@
   (return-type "GstTagList*")
 )
 
-(define-function gst_is_tag_list
+(define-function is_tag_list
   (c-name "gst_is_tag_list")
   (return-type "gboolean")
   (parameters
@@ -4749,7 +4749,7 @@
   )
 )
 
-(define-function gst_tag_list_copy_value
+(define-function tag_list_copy_value
   (c-name "gst_tag_list_copy_value")
   (return-type "gboolean")
   (parameters
@@ -5032,7 +5032,7 @@
   )
 )
 
-(define-function gst_event_new_tag
+(define-function event_new_tag
   (c-name "gst_event_new_tag")
   (return-type "GstEvent*")
   (parameters
@@ -5139,7 +5139,7 @@
   (return-type "GType")
 )
 
-(define-function gst_task_create
+(define-function task_create
   (c-name "gst_task_create")
   (return-type "GstTask*")
   (parameters
@@ -5219,7 +5219,7 @@
   (return-type "none")
 )
 
-(define-function gst_trace_read_tsc
+(define-function trace_read_tsc
   (c-name "gst_trace_read_tsc")
   (return-type "none")
   (parameters
@@ -5227,27 +5227,27 @@
   )
 )
 
-(define-function gst_alloc_trace_available
+(define-function alloc_trace_available
   (c-name "gst_alloc_trace_available")
   (return-type "gboolean")
 )
 
-(define-function gst_alloc_trace_list
+(define-function alloc_trace_list
   (c-name "gst_alloc_trace_list")
   (return-type "const-GList*")
 )
 
-(define-function gst_alloc_trace_live_all
+(define-function alloc_trace_live_all
   (c-name "gst_alloc_trace_live_all")
   (return-type "int")
 )
 
-(define-function gst_alloc_trace_print_all
+(define-function alloc_trace_print_all
   (c-name "gst_alloc_trace_print_all")
   (return-type "none")
 )
 
-(define-function gst_alloc_trace_set_flags_all
+(define-function alloc_trace_set_flags_all
   (c-name "gst_alloc_trace_set_flags_all")
   (return-type "none")
   (parameters
@@ -5255,7 +5255,7 @@
   )
 )
 
-(define-function gst_alloc_trace_get
+(define-function alloc_trace_get
   (c-name "gst_alloc_trace_get")
   (return-type "GstAllocTrace*")
   (parameters
@@ -5312,7 +5312,7 @@
   (return-type "guint64")
 )
 
-(define-function gst_type_find_register
+(define-function type_find_register
   (c-name "gst_type_find_register")
   (return-type "gboolean")
   (parameters
@@ -5331,7 +5331,7 @@
   (return-type "GType")
 )
 
-(define-function gst_type_find_factory_get_list
+(define-function type_find_factory_get_list
   (c-name "gst_type_find_factory_get_list")
   (return-type "GList*")
 )
@@ -5365,7 +5365,7 @@
 
 ;; From ../gstreamer/gst/gsturi.h
 
-(define-function gst_uri_protocol_is_valid
+(define-function uri_protocol_is_valid
   (c-name "gst_uri_protocol_is_valid")
   (return-type "gboolean")
   (parameters
@@ -5373,7 +5373,7 @@
   )
 )
 
-(define-function gst_uri_is_valid
+(define-function uri_is_valid
   (c-name "gst_uri_is_valid")
   (return-type "gboolean")
   (parameters
@@ -5381,7 +5381,7 @@
   )
 )
 
-(define-function gst_uri_get_protocol
+(define-function uri_get_protocol
   (c-name "gst_uri_get_protocol")
   (return-type "gchar*")
   (parameters
@@ -5389,7 +5389,7 @@
   )
 )
 
-(define-function gst_uri_get_location
+(define-function uri_get_location
   (c-name "gst_uri_get_location")
   (return-type "gchar*")
   (parameters
@@ -5397,7 +5397,7 @@
   )
 )
 
-(define-function gst_uri_construct
+(define-function uri_construct
   (c-name "gst_uri_construct")
   (return-type "gchar*")
   (parameters
@@ -5406,7 +5406,7 @@
   )
 )
 
-(define-function gst_element_make_from_uri
+(define-function element_make_from_uri
   (c-name "gst_element_make_from_uri")
   (return-type "GstElement*")
   (parameters
@@ -5470,7 +5470,7 @@
 
 ;; From ../gstreamer/gst/gstutils.h
 
-(define-function gst_util_set_value_from_string
+(define-function util_set_value_from_string
   (c-name "gst_util_set_value_from_string")
   (return-type "none")
   (parameters
@@ -5479,7 +5479,7 @@
   )
 )
 
-(define-function gst_util_set_object_arg
+(define-function util_set_object_arg
   (c-name "gst_util_set_object_arg")
   (return-type "none")
   (parameters
@@ -5489,7 +5489,7 @@
   )
 )
 
-(define-function gst_util_dump_mem
+(define-function util_dump_mem
   (c-name "gst_util_dump_mem")
   (return-type "none")
   (parameters
@@ -5498,7 +5498,7 @@
   )
 )
 
-(define-function gst_print_pad_caps
+(define-function print_pad_caps
   (c-name "gst_print_pad_caps")
   (return-type "none")
   (parameters
@@ -5508,7 +5508,7 @@
   )
 )
 
-(define-function gst_print_element_args
+(define-function print_element_args
   (c-name "gst_print_element_args")
   (return-type "none")
   (parameters
@@ -5583,11 +5583,11 @@
   )
 )
 
-(define-method link_many
-  (of-object "GstElement")
+(define-function element_link_many
   (c-name "gst_element_link_many")
   (return-type "gboolean")
   (parameters
+    '("GstElement*" "element_1")
     '("GstElement*" "element_2")
   )
   (varargs #t)
@@ -5602,11 +5602,11 @@
   )
 )
 
-(define-method unlink_many
-  (of-object "GstElement")
+(define-function element_unlink_many
   (c-name "gst_element_unlink_many")
   (return-type "none")
   (parameters
+	'("GstElement*" "element_1")
     '("GstElement*" "element_2")
   )
   (varargs #t)
@@ -5773,7 +5773,7 @@
   )
 )
 
-(define-function gst_atomic_int_set
+(define-function atomic_int_set
   (c-name "gst_atomic_int_set")
   (return-type "none")
   (parameters
@@ -5786,7 +5786,7 @@
 
 ;; From ../gstreamer/gst/gstvalue.h
 
-(define-function gst_value_register
+(define-function value_register
   (c-name "gst_value_register")
   (return-type "none")
   (parameters
@@ -5794,7 +5794,7 @@
   )
 )
 
-(define-function gst_value_init_and_copy
+(define-function value_init_and_copy
   (c-name "gst_value_init_and_copy")
   (return-type "none")
   (parameters
@@ -5803,7 +5803,7 @@
   )
 )
 
-(define-function gst_value_serialize
+(define-function value_serialize
   (c-name "gst_value_serialize")
   (return-type "gchar*")
   (parameters
@@ -5811,7 +5811,7 @@
   )
 )
 
-(define-function gst_value_deserialize
+(define-function value_deserialize
   (c-name "gst_value_deserialize")
   (return-type "gboolean")
   (parameters
@@ -5820,7 +5820,7 @@
   )
 )
 
-(define-function gst_value_list_append_value
+(define-function value_list_append_value
   (c-name "gst_value_list_append_value")
   (return-type "none")
   (parameters
@@ -5829,7 +5829,7 @@
   )
 )
 
-(define-function gst_value_list_prepend_value
+(define-function value_list_prepend_value
   (c-name "gst_value_list_prepend_value")
   (return-type "none")
   (parameters
@@ -5838,7 +5838,7 @@
   )
 )
 
-(define-function gst_value_list_concat
+(define-function value_list_concat
   (c-name "gst_value_list_concat")
   (return-type "none")
   (parameters
@@ -5848,7 +5848,7 @@
   )
 )
 
-(define-function gst_value_list_get_size
+(define-function value_list_get_size
   (c-name "gst_value_list_get_size")
   (return-type "guint")
   (parameters
@@ -5856,7 +5856,7 @@
   )
 )
 
-(define-function gst_value_list_get_value
+(define-function value_list_get_value
   (c-name "gst_value_list_get_value")
   (return-type "const-GValue*")
   (parameters
@@ -5865,7 +5865,7 @@
   )
 )
 
-(define-function gst_value_set_fourcc
+(define-function value_set_fourcc
   (c-name "gst_value_set_fourcc")
   (return-type "none")
   (parameters
@@ -5874,7 +5874,7 @@
   )
 )
 
-(define-function gst_value_get_fourcc
+(define-function value_get_fourcc
   (c-name "gst_value_get_fourcc")
   (return-type "guint32")
   (parameters
@@ -5882,7 +5882,7 @@
   )
 )
 
-(define-function gst_value_set_int_range
+(define-function value_set_int_range
   (c-name "gst_value_set_int_range")
   (return-type "none")
   (parameters
@@ -5892,7 +5892,7 @@
   )
 )
 
-(define-function gst_value_get_int_range_min
+(define-function value_get_int_range_min
   (c-name "gst_value_get_int_range_min")
   (return-type "int")
   (parameters
@@ -5900,7 +5900,7 @@
   )
 )
 
-(define-function gst_value_get_int_range_max
+(define-function value_get_int_range_max
   (c-name "gst_value_get_int_range_max")
   (return-type "int")
   (parameters
@@ -5908,7 +5908,7 @@
   )
 )
 
-(define-function gst_value_set_double_range
+(define-function value_set_double_range
   (c-name "gst_value_set_double_range")
   (return-type "none")
   (parameters
@@ -5918,7 +5918,7 @@
   )
 )
 
-(define-function gst_value_get_double_range_min
+(define-function value_get_double_range_min
   (c-name "gst_value_get_double_range_min")
   (return-type "double")
   (parameters
@@ -5926,7 +5926,7 @@
   )
 )
 
-(define-function gst_value_get_double_range_max
+(define-function value_get_double_range_max
   (c-name "gst_value_get_double_range_max")
   (return-type "double")
   (parameters
@@ -5934,7 +5934,7 @@
   )
 )
 
-(define-function gst_value_get_caps
+(define-function value_get_caps
   (c-name "gst_value_get_caps")
   (return-type "const-GstCaps*")
   (parameters
@@ -5942,7 +5942,7 @@
   )
 )
 
-(define-function gst_value_set_caps
+(define-function value_set_caps
   (c-name "gst_value_set_caps")
   (return-type "none")
   (parameters
@@ -5951,7 +5951,7 @@
   )
 )
 
-(define-function gst_value_set_fraction
+(define-function value_set_fraction
   (c-name "gst_value_set_fraction")
   (return-type "none")
   (parameters
@@ -5961,7 +5961,7 @@
   )
 )
 
-(define-function gst_value_get_fraction_numerator
+(define-function value_get_fraction_numerator
   (c-name "gst_value_get_fraction_numerator")
   (return-type "int")
   (parameters
@@ -5969,7 +5969,7 @@
   )
 )
 
-(define-function gst_value_get_fraction_denominator
+(define-function value_get_fraction_denominator
   (c-name "gst_value_get_fraction_denominator")
   (return-type "int")
   (parameters
@@ -5977,7 +5977,7 @@
   )
 )
 
-(define-function gst_value_fraction_multiply
+(define-function value_fraction_multiply
   (c-name "gst_value_fraction_multiply")
   (return-type "gboolean")
   (parameters
@@ -5987,7 +5987,7 @@
   )
 )
 
-(define-function gst_value_compare
+(define-function value_compare
   (c-name "gst_value_compare")
   (return-type "int")
   (parameters
@@ -5996,7 +5996,7 @@
   )
 )
 
-(define-function gst_value_can_compare
+(define-function value_can_compare
   (c-name "gst_value_can_compare")
   (return-type "gboolean")
   (parameters
@@ -6005,7 +6005,7 @@
   )
 )
 
-(define-function gst_value_union
+(define-function value_union
   (c-name "gst_value_union")
   (return-type "gboolean")
   (parameters
@@ -6015,7 +6015,7 @@
   )
 )
 
-(define-function gst_value_can_union
+(define-function value_can_union
   (c-name "gst_value_can_union")
   (return-type "gboolean")
   (parameters
@@ -6024,7 +6024,7 @@
   )
 )
 
-(define-function gst_value_register_union_func
+(define-function value_register_union_func
   (c-name "gst_value_register_union_func")
   (return-type "none")
   (parameters
@@ -6034,7 +6034,7 @@
   )
 )
 
-(define-function gst_value_intersect
+(define-function value_intersect
   (c-name "gst_value_intersect")
   (return-type "gboolean")
   (parameters
@@ -6044,7 +6044,7 @@
   )
 )
 
-(define-function gst_value_can_intersect
+(define-function value_can_intersect
   (c-name "gst_value_can_intersect")
   (return-type "gboolean")
   (parameters
@@ -6053,7 +6053,7 @@
   )
 )
 
-(define-function gst_value_register_intersect_func
+(define-function value_register_intersect_func
   (c-name "gst_value_register_intersect_func")
   (return-type "none")
   (parameters
@@ -6063,7 +6063,7 @@
   )
 )
 
-(define-function gst_value_subtract
+(define-function value_subtract
   (c-name "gst_value_subtract")
   (return-type "gboolean")
   (parameters
@@ -6073,7 +6073,7 @@
   )
 )
 
-(define-function gst_value_can_subtract
+(define-function value_can_subtract
   (c-name "gst_value_can_subtract")
   (return-type "gboolean")
   (parameters
@@ -6082,7 +6082,7 @@
   )
 )
 
-(define-function gst_value_register_subtract_func
+(define-function value_register_subtract_func
   (c-name "gst_value_register_subtract_func")
   (return-type "none")
   (parameters
@@ -6092,7 +6092,7 @@
   )
 )
 
-(define-function gst_type_is_fixed
+(define-function type_is_fixed
   (c-name "gst_type_is_fixed")
   (return-type "gboolean")
   (parameters
@@ -6100,7 +6100,7 @@
   )
 )
 
-(define-function gst_value_is_fixed
+(define-function value_is_fixed
   (c-name "gst_value_is_fixed")
   (return-type "gboolean")
   (parameters
@@ -6112,7 +6112,7 @@
 
 ;; From ../gstreamer/gst/gstversion.h
 
-(define-function gst_version
+(define-function version
   (c-name "gst_version")
   (return-type "none")
   (parameters
@@ -6131,7 +6131,7 @@
   (return-type "GType")
 )
 
-(define-function gst_xml_write
+(define-function xml_write
   (c-name "gst_xml_write")
   (return-type "xmlDocPtr")
   (parameters
@@ -6139,7 +6139,7 @@
   )
 )
 
-(define-function gst_xml_write_file
+(define-function xml_write_file
   (c-name "gst_xml_write_file")
   (return-type "gint")
   (parameters
@@ -6150,7 +6150,7 @@
 
 (define-function gst_xml_new
   (c-name "gst_xml_new")
-  (is-constructor-of "GstXml")
+  (is-constructor-of "GstXML")
   (return-type "GstXML*")
 )
 
@@ -6200,7 +6200,7 @@
   (return-type "GList*")
 )
 
-(define-function gst_xml_make_element
+(define-function xml_make_element
   (c-name "gst_xml_make_element")
   (return-type "GstElement*")
   (parameters
diff --git a/gst/gst.override b/gst/gst.override
index 7c7816f2c6..76f46a28d0 100644
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -101,7 +101,8 @@ _pygst_element_check_error (GstElement *element)
   msg = PyObject_Str (value);
   typemsg = PyObject_Str (type);
   if (msg && PyString_Check (msg)) {
-	    gst_element_error_full (element, GST_LIBRARY_ERROR,
+	    gst_element_message_full (element, GST_MESSAGE_ERROR,
+                    GST_LIBRARY_ERROR,
 		    GST_LIBRARY_ERROR_FAILED,
 		    g_strdup (PyString_AsString (msg)), 
 		    typemsg ? g_strconcat (PyString_AsString (typemsg), 
@@ -111,7 +112,8 @@ _pygst_element_check_error (GstElement *element)
 		    frame ? PyString_AsString(frame->f_code->co_name) : "???",
 		    lineno ? PyInt_AsLong (lineno) : 0);
   } else {
-	gst_element_error_full (element, GST_LIBRARY_ERROR,
+	gst_element_message_full (element, GST_MESSAGE_ERROR,
+                    GST_LIBRARY_ERROR,
 		    GST_LIBRARY_ERROR_TOO_LAZY,
 		    NULL, NULL,
 		    frame ? PyString_AsString(frame->f_code->co_filename) : "???",
diff --git a/gst/gstelement.override b/gst/gstelement.override
index 85ad9a82b6..0525c65713 100644
--- a/gst/gstelement.override
+++ b/gst/gstelement.override
@@ -85,25 +85,25 @@ _wrap_gst_element_set_state(PyGObject *self, PyObject *args, PyObject *kwargs)
 	return PyInt_FromLong(ret);
 }
 %%
-override gst_element_query kwargs
-static PyObject *
-_wrap_gst_element_query(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "type", "format", NULL };
-	GstQueryType type;
-	GstFormat format;
-	gint64 value = 0;
-	gboolean ret;
+/* override gst_element_query kwargs */
+/* static PyObject * */
+/* _wrap_gst_element_query(PyGObject *self, PyObject *args, PyObject *kwargs) */
+/* { */
+/* 	static char *kwlist[] = { "type", "format", NULL }; */
+/* 	GstQueryType type; */
+/* 	GstFormat format; */
+/* 	gint64 value = 0; */
+/* 	gboolean ret; */
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-					 "ii:GstElement.query", kwlist,
-					 &type, &format))
-		return NULL;
+/* 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, */
+/* 					 "ii:GstElement.query", kwlist, */
+/* 					 &type, &format)) */
+/* 		return NULL; */
 	
-	ret = gst_element_query(GST_ELEMENT(self->obj), type, &format, &value);
-	return PyLong_FromLongLong(value);
-}
-%%
+/* 	ret = gst_element_query(GST_ELEMENT(self->obj), type, &format, &value); */
+/* 	return PyLong_FromLongLong(value); */
+/* } */
+/* %% */
 override gst_element_convert kwargs
 static PyObject *
 _wrap_gst_element_convert(PyGObject *self, PyObject *args, PyObject *kwargs)
@@ -183,48 +183,48 @@ _wrap_gst_element_link_many(PyObject *self, PyObject *args)
 }
 
 
-%%
-override gst_element_link kwargs
-static PyObject *
-_wrap_gst_element_link(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "dest", "filtercaps", NULL };
-    PyGObject *dest;
-    PyObject *py_caps = NULL;
-    int ret;
-    GstCaps *caps = NULL;
-    gboolean caps_is_copy;
+/* %% */
+/* override gst_element_link kwargs */
+/* static PyObject * */
+/* _wrap_gst_element_link(PyGObject *self, PyObject *args, PyObject *kwargs) */
+/* { */
+/*     static char *kwlist[] = { "dest", "filtercaps", NULL }; */
+/*     PyGObject *dest; */
+/*     PyObject *py_caps = NULL; */
+/*     int ret; */
+/*     GstCaps *caps = NULL; */
+/*     gboolean caps_is_copy; */
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O:GstElement.link",
-                                     kwlist, &PyGstElement_Type, &dest, &py_caps))
-        return NULL;
-    if (py_caps == NULL)
-      caps = NULL;
-    else
-      caps = pygst_caps_from_pyobject (py_caps, &caps_is_copy);
-    ret = gst_element_link_filtered(GST_ELEMENT(self->obj), GST_ELEMENT(dest->obj), caps);
-    if (caps && caps_is_copy)
-        gst_caps_free (caps);
-    if (!ret) {
-	PyErr_Format(PyGstExc_LinkError,
-		     "failed to link %s with %s",
-		     GST_ELEMENT_NAME(self->obj),
-		     GST_ELEMENT_NAME(dest->obj));
-        return NULL;
-    }
-    return PyBool_FromLong(ret);
-}
+/*     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O:GstElement.link", */
+/*                                      kwlist, &PyGstElement_Type, &dest, &py_caps)) */
+/*         return NULL; */
+/*     if (py_caps == NULL) */
+/*       caps = NULL; */
+/*     else */
+/*       caps = pygst_caps_from_pyobject (py_caps, &caps_is_copy); */
+/*     ret = gst_element_link_filtered(GST_ELEMENT(self->obj), GST_ELEMENT(dest->obj), caps); */
+/*     if (caps && caps_is_copy) */
+/*         gst_caps_unref (caps); */
+/*     if (!ret) { */
+/* 	PyErr_Format(PyGstExc_LinkError, */
+/* 		     "failed to link %s with %s", */
+/* 		     GST_ELEMENT_NAME(self->obj), */
+/* 		     GST_ELEMENT_NAME(dest->obj)); */
+/*         return NULL; */
+/*     } */
+/*     return PyBool_FromLong(ret); */
+/* } */
 
-%%
-override gst_element_link_filtered kwargs
-static PyObject *
-_wrap_gst_element_link_filtered(PyGObject *self, PyObject *args,
-                                PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "element.link_filtered is deprecated, use element.link") < 0)
-	return NULL;
-    return _wrap_gst_element_link (self, args, kwargs);
-}
+/* %% */
+/* override gst_element_link_filtered kwargs */
+/* static PyObject * */
+/* _wrap_gst_element_link_filtered(PyGObject *self, PyObject *args, */
+/*                                 PyObject *kwargs) */
+/* { */
+/*     if (PyErr_Warn(PyExc_DeprecationWarning, "element.link_filtered is deprecated, use element.link") < 0) */
+/* 	return NULL; */
+/*     return _wrap_gst_element_link (self, args, kwargs); */
+/* } */
 
 %%
 override gst_element_link_pads kwargs
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index fd5250e0c8..7cc9d59f6d 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -64,14 +64,14 @@ python_do_pending_calls(gpointer data)
     return TRUE;
 }
 
-static void
-sink_gstobject(GObject *object)
-{
-     if (GST_OBJECT_FLOATING(object)) {
-	  g_object_ref(object);
-	  gst_object_sink(GST_OBJECT(object));
-     }
-}
+/* static void */
+/* sink_gstobject(GObject *object) */
+/* { */
+/*      if (GST_OBJECT_FLOATING(object)) { */
+/* 	  g_object_ref(object); */
+/* 	  gst_object_sink(GST_OBJECT(object)); */
+/*      } */
+/* } */
 
 DL_EXPORT(void)
 init_gst (void)
@@ -115,8 +115,8 @@ init_gst (void)
 	  g_free (argv);
      }
 
-     _pygst_register_boxed_types (NULL);
-     pygobject_register_sinkfunc(GST_TYPE_OBJECT, sink_gstobject);
+/*      _pygst_register_boxed_types (NULL); */
+ /*     pygobject_register_sinkfunc(GST_TYPE_OBJECT, sink_gstobject); */
 
      m = Py_InitModule ("_gst", pygst_functions);
      d = PyModule_GetDict (m);
diff --git a/gst/gstpad.override b/gst/gstpad.override
index 07076e69ad..283ca44dbe 100644
--- a/gst/gstpad.override
+++ b/gst/gstpad.override
@@ -131,7 +131,7 @@ call_getcaps_function (GstPad *pad)
 	GstCaps *caps;
 	
 	g_value_init (&ret, GST_TYPE_CAPS);
-	g_value_init (&args, GST_TYPE_REAL_PAD);
+	g_value_init (&args, GST_TYPE_PAD);
 	g_value_set_object (&args, pad);
 	
 	closure = pad_private(pad)->getcaps_function;
@@ -163,7 +163,7 @@ handle_link_function_exception (GValue *ret, guint n, const GValue *params)
 }
 
 static GstPadLinkReturn
-call_link_function (GstPad *pad, const GstCaps *caps)
+call_link_function (GstPad *pad, GstPad *peer)
 {
 	GClosure *closure;
 	GValue ret = { 0, };
@@ -171,10 +171,10 @@ call_link_function (GstPad *pad, const GstCaps *caps)
 	GstPadLinkReturn i;
 	
 	g_value_init (&ret, GST_TYPE_PAD_LINK_RETURN);
-	g_value_init (&args[0], GST_TYPE_REAL_PAD);
-	g_value_init (&args[1], GST_TYPE_CAPS);
+	g_value_init (&args[0], GST_TYPE_PAD);
+	g_value_init (&args[1], GST_TYPE_PAD);
 	g_value_set_object (&args[0], pad);
-	g_value_set_boxed (&args[1], caps);
+	g_value_set_boxed (&args[1], peer);
 	
 	closure = pad_private(pad)->link_function;
 	
@@ -207,28 +207,35 @@ handle_chain_function_exception (GValue *ret, guint n, const GValue *params)
     g_assert_not_reached (); /* only returns FALSE when there's no error */
 }
 
-static void
-call_chain_function(GstPad *pad, GstData *data)
+static GstFlowReturn
+call_chain_function(GstPad *pad, GstBuffer *data)
 {
 	GClosure *closure;
+	GValue ret = { 0, };
 	GValue args[2] = { { 0, }, { 0, } };
+	GstFlowReturn	flow;
 	
-	g_value_init (&args[0], GST_TYPE_REAL_PAD);
+	g_value_init (&ret, G_TYPE_ENUM);
+	g_value_set_enum (&ret, GST_FLOW_ERROR);
+	g_value_init (&args[0], GST_TYPE_PAD);
 	if (GST_IS_BUFFER (data)) {
 	  g_value_init (&args[1], GST_TYPE_BUFFER);
 	} else if (GST_IS_EVENT (data)) {
 	  g_value_init (&args[1], GST_TYPE_EVENT);
-	} else {
-	  g_value_init (&args[1], GST_TYPE_DATA);
 	}
+
 	g_value_set_object (&args[0], pad);
 	g_value_take_boxed (&args[1], data);
 	closure = pad_private(pad)->chain_function;
 	
-	g_closure_invoke (closure, NULL, 2, args, NULL);
+	g_closure_invoke (closure, &ret, 2, args, NULL);
+	flow = g_value_get_enum (&ret);
 
+	g_value_unset (&ret);
 	g_value_unset (&args[0]);
 	g_value_unset (&args[1]);
+
+	return flow;
 }
 
 static PyObject*
@@ -260,7 +267,7 @@ call_event_function (GstPad *pad, GstEvent *event)
 	
 	g_value_init (&ret, G_TYPE_BOOLEAN);
 	g_value_set_boolean (&ret, FALSE);
-	g_value_init (&args[0], GST_TYPE_REAL_PAD);
+	g_value_init (&args[0], GST_TYPE_PAD);
 	g_value_init (&args[1], GST_TYPE_EVENT);
 	g_value_set_object (&args[0], pad);
 	g_value_set_boxed (&args[1], event);
@@ -349,25 +356,25 @@ _wrap_gst_pad_tp_repr (PyGObject *self)
 }
 
 %%
-override gst_pad_query kwargs
-static PyObject *
-_wrap_gst_pad_query(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "type", "format", NULL };
-	GstQueryType type;
-	GstFormat format;
-	gint64 value = 0;
-	gboolean ret;
+/* override gst_pad_query kwargs */
+/* static PyObject * */
+/* _wrap_gst_pad_query(PyGObject *self, PyObject *args, PyObject *kwargs) */
+/* { */
+/* 	static char *kwlist[] = { "type", "format", NULL }; */
+/* 	GstQueryType type; */
+/* 	GstFormat format; */
+/* 	gint64 value = 0; */
+/* 	gboolean ret; */
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-					 "ii:GstPad.query", kwlist,
-					 &type, &format))
-		return NULL;
+/* 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, */
+/* 					 "ii:GstPad.query", kwlist, */
+/* 					 &type, &format)) */
+/* 		return NULL; */
 	
-	ret = gst_pad_query(GST_PAD(self->obj), type, &format, &value);
-	return PyLong_FromLongLong(value);
-}
-%%
+/* 	ret = gst_pad_query(GST_PAD(self->obj), type, &format, &value); */
+/* 	return PyLong_FromLongLong(value); */
+/* } */
+/* %% */
 override gst_pad_convert kwargs
 static PyObject *
 _wrap_gst_pad_convert(PyGObject *self, PyObject *args, PyObject *kwargs)
diff --git a/gst/gststructure.override b/gst/gststructure.override
index 1b2aa893c5..3c9c0dd9e1 100644
--- a/gst/gststructure.override
+++ b/gst/gststructure.override
@@ -229,7 +229,7 @@ static PyMappingMethods _wrap_gst_structure_tp_as_mapping = {
 override gst_structure_foreach kwargs
 static gboolean
 pygst_structure_foreach_marshal(GQuark field_id,
-				GValue *value,
+				const GValue *value,
 				gpointer user_data)
 {
 	PyGstCustomNotify *cunote = user_data;