diff --git a/ChangeLog b/ChangeLog
index 02edc5adbd..6ca6733c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-03  Edward Hervey  <edward@fluendo.com>
+
+	* gst/gstelement.override:
+	* gst/gstevent.override:
+	* gst/gstmessage.override:
+	* gst/gstquery.override:
+	Repeat 100 times : "I shouldn't commit patches without checking
+	them thoroughly, especially if they come from someone I trust".
+	Fix the broken Py_BuildValue.
+
 2006-07-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* Makefile.am:
diff --git a/gst/gstelement.override b/gst/gstelement.override
index c178cce83e..99af4dc028 100644
--- a/gst/gstelement.override
+++ b/gst/gstelement.override
@@ -98,7 +98,7 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
 
     pyg_end_allow_threads;
 
-    tuple = Py_BuildValue("OOO",
+    tuple = Py_BuildValue("(OOO)",
         pyg_enum_from_gtype (GST_TYPE_STATE_CHANGE_RETURN, ret),
         pyg_enum_from_gtype (GST_TYPE_STATE, state),
         pyg_enum_from_gtype (GST_TYPE_STATE, pending));
@@ -383,8 +383,7 @@ _wrap_gst_element_query_position (PyGObject *self, PyObject *args)
         return NULL;
     }
 
-    return Py_BuildValue("(OO)", 
-			 PyLong_FromLongLong(cur), 
+    return Py_BuildValue("(LO)", cur,
 			 pyg_enum_from_gtype(GST_TYPE_FORMAT, format));
 }
 %%
@@ -408,7 +407,7 @@ _wrap_gst_element_query_duration (PyGObject *self, PyObject *args)
         return NULL;
     }
 
-    return Py_BuildValue("(OO)", PyLong_FromLongLong(cur),
+    return Py_BuildValue("(LO)", cur,
 			 pyg_enum_from_gtype(GST_TYPE_FORMAT, format));
 }
 %%
@@ -445,9 +444,9 @@ _wrap_gst_element_query_convert (PyGObject *self, PyObject *args, PyObject *kwar
 	return Py_None;
     }
     
-    return Py_BuildValue("(OO)", 
+    return Py_BuildValue("(OL)", 
 			 pyg_enum_from_gtype(GST_TYPE_FORMAT, destformat),
-			 PyLong_FromLongLong(dstval));					     
+			 dstval);					     
 }
 %%
 override gst_element_get_query_types noargs
diff --git a/gst/gstevent.override b/gst/gstevent.override
index 1534f39638..fb7ab49dd8 100644
--- a/gst/gstevent.override
+++ b/gst/gstevent.override
@@ -67,7 +67,7 @@ _wrap_gst_event_parse_new_segment (PyGstMiniObject *self)
      gst_event_parse_new_segment (GST_EVENT(self->obj), &update, &rate, &format,
 				 &start_value, &stop_value, &base);
 
-     return Py_BuildValue("(OfOKKK)",
+     return Py_BuildValue("(OdOLLL)",
 			  PyBool_FromLong(update),
 			  rate, pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
 			  start_value, stop_value, base);
@@ -108,7 +108,7 @@ _wrap_gst_event_parse_qos (PyGstMiniObject *self)
 	gst_event_parse_qos (GST_EVENT(self->obj), &proportion,
 			     &diff, &timestamp);
 	
-       return Py_BuildValue("(fLK)", proportion, diff, timestamp);
+       return Py_BuildValue("(dLK)", proportion, diff, timestamp);
 }
 %%
 override gst_event_parse_seek noargs
@@ -131,7 +131,7 @@ _wrap_gst_event_parse_seek (PyGstMiniObject *self)
 	gst_event_parse_seek (GST_EVENT(self->obj), &rate, &format, &flags,
 			      &cur_type, &cur, &stop_type, &stop);
 	
-	return Py_BuildValue("(fOOOKOK)",
+	return Py_BuildValue("(dOOOLOL)",
 			     rate,
 			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
 			     pyg_flags_from_gtype (GST_TYPE_SEEK_FLAGS, flags),
diff --git a/gst/gstmessage.override b/gst/gstmessage.override
index 486138b28c..235a8a305a 100644
--- a/gst/gstmessage.override
+++ b/gst/gstmessage.override
@@ -86,7 +86,7 @@ _wrap_gst_message_parse_segment_start (PyGstMiniObject *self)
 
   return Py_BuildValue("(OL)",
 		       pyg_enum_from_gtype(GST_TYPE_FORMAT, format),
-		       PyLong_FromLongLong(position));
+		       position);
 }
 
 %%
@@ -106,7 +106,7 @@ _wrap_gst_message_parse_segment_done (PyGstMiniObject *self)
 
   return Py_BuildValue("(OL)",
 		       pyg_enum_from_gtype(GST_TYPE_FORMAT, format),
-		       PyLong_FromLongLong(position));
+		       position);
 }
 
 %%
@@ -248,5 +248,5 @@ _wrap_gst_message_parse_duration (PyGstMiniObject *self)
 
   return Py_BuildValue("(OL)",
 		       pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
-		       PyLong_FromLongLong(duration));
+		       duration);
 }
diff --git a/gst/gstquery.override b/gst/gstquery.override
index da459aa19e..0e4d1c8801 100644
--- a/gst/gstquery.override
+++ b/gst/gstquery.override
@@ -37,8 +37,9 @@ _wrap_gst_query_parse_position (PyGstMiniObject *self)
 	
 	gst_query_parse_position (GST_QUERY(self->obj), &format, &cur);
 	
-	return Py_BuildValue("(LO)", cur,
-			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format));
+	return Py_BuildValue("(OL)",
+			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
+			     cur);
 }
 %%
 override gst_query_parse_duration noargs
@@ -55,8 +56,9 @@ _wrap_gst_query_parse_duration (PyGstMiniObject *self)
 	
 	gst_query_parse_duration (GST_QUERY(self->obj), &format, &cur);
 	
-	return Py_BuildValue("(LO)", cur,
-			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format));
+	return Py_BuildValue("(OL)",
+			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
+			     cur);
 }
 %%
 override gst_query_parse_convert noargs
@@ -100,7 +102,7 @@ _wrap_gst_query_parse_segment (PyGstMiniObject *self)
 				 &rate, &format,
 				 &start_value, &stop_value);
 	
-	return Py_BuildValue("(fOLL)",
+	return Py_BuildValue("(dOLL)",
 			     rate,
 			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
 			     start_value, stop_value);
@@ -123,9 +125,9 @@ _wrap_gst_query_parse_seeking (PyGstMiniObject *self)
 				 &format, &seekable,
 				 &segment_start, &segment_end);
 	
-	return Py_BuildValue("(OLKK)",
+	return Py_BuildValue("(OOLL)",
 			     pyg_enum_from_gtype (GST_TYPE_FORMAT, format),
-			     seekable,
+			     PyBool_FromLong(seekable),
 			     segment_start,
 			     segment_end);
 }