diff --git a/ChangeLog b/ChangeLog
index 19ed47cb91..4cb4b815d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-12-10  David Hampton  <hampton@employees.org>
 
+	* src/gnome-utils/dialog-utils.c: Fix the glade auto-connect code
+	so it doesn't swap the callback arguments when an explicit
+	"object" is provided to the callback.  (This is an unused code
+	path that is about to be used.)
+
 	* src/register/register-gnome/gnucash-grid.c: Andreas Köhler's
 	patch to fix the alignment of cells in the register.
 
diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index cd8b06acc5..4fe45803bb 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -913,9 +913,9 @@ gnc_glade_autoconnect_full_func(const gchar *handler_name,
   if (other_object) {
     if (signal_after)
       g_signal_connect_object (signal_object, signal_name, func,
-			       other_object, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+			       other_object, G_CONNECT_AFTER);
     else
-      g_signal_connect_swapped (signal_object, signal_name, func, other_object);
+      g_signal_connect_object (signal_object, signal_name, func, other_object, 0);
   } else {
     if (signal_after)
       g_signal_connect_after(signal_object, signal_name, func, user_data);