From 7db084ec5beb4370c73ab28e69d030c90424c11e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Sep 2003 21:04:01 +0000 Subject: [PATCH] Disconnect from prev_action, not from action. (Fix by David Hampton) 2003-09-06 Matthias Clasen * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from prev_action, not from action. (Fix by David Hampton) --- ChangeLog | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gtk/gtkaction.c | 4 +--- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd3ed86a32..03380a5970 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2003-09-06 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from + prev_action, not from action. (Fix by David Hampton) + Fri Sep 5 14:15:10 2003 Owen Taylor - * Back out locale-dependent interpretation of + * Back out locale-dependent interpretation of KP_Decimal, the official XFree86 interpretation is that KP_Decimal => . KP_Separator => , always, independent of locale. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd3ed86a32..03380a5970 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,6 +1,11 @@ +2003-09-06 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from + prev_action, not from action. (Fix by David Hampton) + Fri Sep 5 14:15:10 2003 Owen Taylor - * Back out locale-dependent interpretation of + * Back out locale-dependent interpretation of KP_Decimal, the official XFree86 interpretation is that KP_Decimal => . KP_Separator => , always, independent of locale. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd3ed86a32..03380a5970 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,6 +1,11 @@ +2003-09-06 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from + prev_action, not from action. (Fix by David Hampton) + Fri Sep 5 14:15:10 2003 Owen Taylor - * Back out locale-dependent interpretation of + * Back out locale-dependent interpretation of KP_Decimal, the official XFree86 interpretation is that KP_Decimal => . KP_Separator => , always, independent of locale. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd3ed86a32..03380a5970 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,6 +1,11 @@ +2003-09-06 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from + prev_action, not from action. (Fix by David Hampton) + Fri Sep 5 14:15:10 2003 Owen Taylor - * Back out locale-dependent interpretation of + * Back out locale-dependent interpretation of KP_Decimal, the official XFree86 interpretation is that KP_Decimal => . KP_Separator => , always, independent of locale. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd3ed86a32..03380a5970 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,6 +1,11 @@ +2003-09-06 Matthias Clasen + + * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from + prev_action, not from action. (Fix by David Hampton) + Fri Sep 5 14:15:10 2003 Owen Taylor - * Back out locale-dependent interpretation of + * Back out locale-dependent interpretation of KP_Decimal, the official XFree86 interpretation is that KP_Decimal => . KP_Separator => , always, independent of locale. diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 1be5c5aae7..926cc1b4ac 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -814,9 +814,7 @@ gtk_action_connect_proxy (GtkAction *action, prev_action = g_object_get_data (G_OBJECT (proxy), "gtk-action"); if (prev_action) - { - (* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (action, proxy); - } + (* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (prev_action, proxy); (* GTK_ACTION_GET_CLASS (action)->connect_proxy) (action, proxy); }