From f314322885ac364f40a8fafd59cb1502e9cf20b9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 7 Dec 1998 02:58:24 +0000 Subject: [PATCH] when marshalling connect_object signals, don't pass the data pointer Mon Dec 7 03:52:01 1998 Tim Janik * 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). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksignal.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8a8c7f089..27be7b68a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Dec 7 03:52:01 1998 Tim Janik + + * 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 * gtk/gtktypeutils.h: diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 5e52fee3c..6fe59937b 100644 --- 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, -- 2.43.2