summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkaction.c8
5 files changed, 32 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8aecd63753..216d4b624e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-22 Philip Langdale <plangdale@vmware.com>
+
+ * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+ (gtk_action_sync_property and gtk_action_sync_sensitive) were
+ not being correctly disconnected, leading to actions continuing
+ to affect disconnected proxies. (#150607)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8aecd63753..216d4b624e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-08-22 Philip Langdale <plangdale@vmware.com>
+
+ * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+ (gtk_action_sync_property and gtk_action_sync_sensitive) were
+ not being correctly disconnected, leading to actions continuing
+ to affect disconnected proxies. (#150607)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8aecd63753..216d4b624e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-08-22 Philip Langdale <plangdale@vmware.com>
+
+ * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+ (gtk_action_sync_property and gtk_action_sync_sensitive) were
+ not being correctly disconnected, leading to actions continuing
+ to affect disconnected proxies. (#150607)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8aecd63753..216d4b624e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-08-22 Philip Langdale <plangdale@vmware.com>
+
+ * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+ (gtk_action_sync_property and gtk_action_sync_sensitive) were
+ not being correctly disconnected, leading to actions continuing
+ to affect disconnected proxies. (#150607)
+
2004-08-22 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index b3b0557e0c..b757957169 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -968,12 +968,12 @@ disconnect_proxy (GtkAction *action,
action);
/* disconnect handlers for notify::* signals */
- g_signal_handlers_disconnect_by_func (proxy,
+ g_signal_handlers_disconnect_by_func (action,
G_CALLBACK (gtk_action_sync_sensitivity),
- action);
- g_signal_handlers_disconnect_by_func (proxy,
+ proxy);
+ g_signal_handlers_disconnect_by_func (action,
G_CALLBACK (gtk_action_sync_property),
- action);
+ proxy);
g_signal_handlers_disconnect_by_func (action,
G_CALLBACK (gtk_action_sync_stock_id), proxy);