when marshalling connect_object signals, don't pass the data pointer

Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
        signals, don't pass the data pointer twice, but swap it with the
        object pointer (proposed on Nov 30 1998 on gtk-devel-list).

diff --git a/ChangeLog b/ChangeLog
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8a8c7f089ccb3034e15175cc289c8bf595bf12a1..27be7b68a6a4dd06445f13d53f5ec9e679826a39 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Dec  7 03:52:01 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.c (gtk_handlers_run): when marshalling connect_object
+       signals, don't pass the data pointer twice, but swap it with the
+       object pointer (proposed on Nov 30 1998 on gtk-devel-list).
+
 Mon Dec  7 03:08:39 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 5e52fee3c47850a0ddde7cf6ca2e2fd287750b0a..6fe59937b81de141a0ef5225e512daab45f96361 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1874,7 +1874,7 @@ gtk_handlers_run (GtkHandler       *handlers,
                /* don't cast with GTK_OBJECT () */
                (* signal->marshaller) ((GtkObject*) handlers->func_data,
                                        handlers->func,
-                                       handlers->func_data,
+                                       object,
                                        params);
              else
                (* signal->marshaller) (object,