[Gnucash-changes] r12156 - gnucash/trunk - Fix the glade auto-connect code so it doesn't swap the callback

[David Hampton]

Author: hampton
Date: 2005-12-10 19:50:57 -0500 (Sat, 10 Dec 2005)
New Revision: 12156
Trac: http://svn.gnucash.org/trac/changeset/12156

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/dialog-utils.c
Log:
Fix the glade auto-connect code so it doesn't swap the callback
arguments when an explicit "object" is provided to the callback.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-12-10 20:22:11 UTC (rev 12155)
+++ gnucash/trunk/ChangeLog	2005-12-11 00:50:57 UTC (rev 12156)
@@ -1,5 +1,10 @@
 2005-12-10  David Hampton  <hampton at 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.
 

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2005-12-10 20:22:11 UTC (rev 12155)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2005-12-11 00:50:57 UTC (rev 12156)
@@ -913,9 +913,9 @@
   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);