diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 2a767286f..511bcc0ee 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,13 @@
+Sat Oct 28 00:28:09 2000  Tim Janik  <timj@gtk.org>
+
+	* gclosure.c (g_closure_add_marshal_guards): fixed notifier position
+	for post_marshal guard which was off at 0.
+
+Fri Oct 27 21:49:31 2000  Tim Janik  <timj@gtk.org>
+
+	* gobject.[hc]: doh, fix argument order in for
+	g_cclosure_new_object_swap and g_cclosure_new_object.
+
 2000-10-28  Tor Lillqvist  <tml@iki.fi>
 
 	* makefile.{mingw,msc}.in: Make glib-genmarshal.exe.
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 8ecf09140..d1844f787 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -215,8 +215,8 @@ g_closure_add_marshal_guards (GClosure      *closure,
   i = closure->n_guards++;
   closure->notifiers[closure->meta_marshal + i].data = pre_marshal_data;
   closure->notifiers[closure->meta_marshal + i].notify = pre_marshal_notify;
-  closure->notifiers[closure->meta_marshal + i + i].data = post_marshal_data;
-  closure->notifiers[closure->meta_marshal + i + i].notify = post_marshal_notify;
+  closure->notifiers[closure->meta_marshal + i + 1].data = post_marshal_data;
+  closure->notifiers[closure->meta_marshal + i + 1].notify = post_marshal_notify;
 }
 
 void
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 59d4beff7..f50f346ea 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -995,8 +995,8 @@ g_closure_new_object (guint    sizeof_closure,
 }
 
 GClosure*
-g_cclosure_new_object (gpointer  _object,
-		       GCallback callback_func)
+g_cclosure_new_object (GCallback callback_func,
+		       gpointer  _object)
 {
   GObject *object = _object;
   GClosure *closure;
@@ -1012,8 +1012,8 @@ g_cclosure_new_object (gpointer  _object,
 }
 
 GClosure*
-g_cclosure_new_object_swap (gpointer  _object,
-			    GCallback callback_func)
+g_cclosure_new_object_swap (GCallback callback_func,
+			    gpointer  _object)
 {
   GObject *object = _object;
   GClosure *closure;
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 492646888..5d7e21861 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -151,10 +151,10 @@ gpointer    g_object_steal_qdata	   (GObject	   *object,
 					    GQuark	    quark);
 void	    g_object_watch_closure	   (GObject	   *object,
 					    GClosure	   *closure);
-GClosure*   g_cclosure_new_object	   (gpointer        object,
-					    GCallback	    callback_func);
-GClosure*   g_cclosure_new_object_swap	   (gpointer        object,
-					    GCallback	    callback_func);
+GClosure*   g_cclosure_new_object	   (GCallback	    callback_func,
+					    gpointer        object);
+GClosure*   g_cclosure_new_object_swap	   (GCallback	    callback_func,
+					    gpointer        object);
 GClosure*   g_closure_new_object	   (guint           sizeof_closure,
 					    GObject	   *object);
 void        g_value_set_object		   (GValue         *value,