Call g_closure_unref() to unref a closure, not g_object_unref(). (#122637,

2003-09-18  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
	unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)

diff --git a/ChangeLog b/ChangeLog
index 6d8a26ab4dc1c8e30400d09e82073db5c5e3ef80..215cccf1b0a5809389f1ff8a3b5fa5e0c89812be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-18  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
+       unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)
+
        Install accelerators on actions, not on proxies, support
        accelerator-only actions:
        
@@ -13,10 +16,10 @@
        (gtk_action_[dis]connect_accelerator): New functions.
 
        * gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
-       accel_closure and accel_count. We must have a reference to the accel_group,
-       since we need it in connect_proxy. The count is necessary to ensure
-       that the accelerator isn't removed before the last proxy requesting 
-       it has been unmerged.
+       accel_closure and accel_count. We must have a reference to the 
+       accel_group, since we need it in connect_proxy. The count is necessary
+       to ensure that the accelerator isn't removed before the last proxy 
+       requesting it has been unmerged.
        (connect_proxy): Connect the accelerator to the 
        action now, only set the accel_path on the menuitem.
        (remove_proxy): Disconnect the accelerator from the action, not from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d8a26ab4dc1c8e30400d09e82073db5c5e3ef80..215cccf1b0a5809389f1ff8a3b5fa5e0c89812be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2003-09-18  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
+       unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)
+
        Install accelerators on actions, not on proxies, support
        accelerator-only actions:
        
@@ -13,10 +16,10 @@
        (gtk_action_[dis]connect_accelerator): New functions.
 
        * gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
-       accel_closure and accel_count. We must have a reference to the accel_group,
-       since we need it in connect_proxy. The count is necessary to ensure
-       that the accelerator isn't removed before the last proxy requesting 
-       it has been unmerged.
+       accel_closure and accel_count. We must have a reference to the 
+       accel_group, since we need it in connect_proxy. The count is necessary
+       to ensure that the accelerator isn't removed before the last proxy 
+       requesting it has been unmerged.
        (connect_proxy): Connect the accelerator to the 
        action now, only set the accel_path on the menuitem.
        (remove_proxy): Disconnect the accelerator from the action, not from

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6d8a26ab4dc1c8e30400d09e82073db5c5e3ef80..215cccf1b0a5809389f1ff8a3b5fa5e0c89812be 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2003-09-18  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
+       unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)
+
        Install accelerators on actions, not on proxies, support
        accelerator-only actions:
        
@@ -13,10 +16,10 @@
        (gtk_action_[dis]connect_accelerator): New functions.
 
        * gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
-       accel_closure and accel_count. We must have a reference to the accel_group,
-       since we need it in connect_proxy. The count is necessary to ensure
-       that the accelerator isn't removed before the last proxy requesting 
-       it has been unmerged.
+       accel_closure and accel_count. We must have a reference to the 
+       accel_group, since we need it in connect_proxy. The count is necessary
+       to ensure that the accelerator isn't removed before the last proxy 
+       requesting it has been unmerged.
        (connect_proxy): Connect the accelerator to the 
        action now, only set the accel_path on the menuitem.
        (remove_proxy): Disconnect the accelerator from the action, not from

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6d8a26ab4dc1c8e30400d09e82073db5c5e3ef80..215cccf1b0a5809389f1ff8a3b5fa5e0c89812be 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2003-09-18  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
+       unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)
+
        Install accelerators on actions, not on proxies, support
        accelerator-only actions:
        
@@ -13,10 +16,10 @@
        (gtk_action_[dis]connect_accelerator): New functions.
 
        * gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
-       accel_closure and accel_count. We must have a reference to the accel_group,
-       since we need it in connect_proxy. The count is necessary to ensure
-       that the accelerator isn't removed before the last proxy requesting 
-       it has been unmerged.
+       accel_closure and accel_count. We must have a reference to the 
+       accel_group, since we need it in connect_proxy. The count is necessary
+       to ensure that the accelerator isn't removed before the last proxy 
+       requesting it has been unmerged.
        (connect_proxy): Connect the accelerator to the 
        action now, only set the accel_path on the menuitem.
        (remove_proxy): Disconnect the accelerator from the action, not from

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6d8a26ab4dc1c8e30400d09e82073db5c5e3ef80..215cccf1b0a5809389f1ff8a3b5fa5e0c89812be 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2003-09-18  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkaction.c (gtk_action_finalize): Call g_closure_unref() to
+       unref a closure, not g_object_unref().  (#122637, Marco Pesenti Gritti)
+
        Install accelerators on actions, not on proxies, support
        accelerator-only actions:
        
@@ -13,10 +16,10 @@
        (gtk_action_[dis]connect_accelerator): New functions.
 
        * gtk/gtkaction.c (struct _GtkActionPrivate): Add accel_group,
-       accel_closure and accel_count. We must have a reference to the accel_group,
-       since we need it in connect_proxy. The count is necessary to ensure
-       that the accelerator isn't removed before the last proxy requesting 
-       it has been unmerged.
+       accel_closure and accel_count. We must have a reference to the 
+       accel_group, since we need it in connect_proxy. The count is necessary
+       to ensure that the accelerator isn't removed before the last proxy 
+       requesting it has been unmerged.
        (connect_proxy): Connect the accelerator to the 
        action now, only set the accel_path on the menuitem.
        (remove_proxy): Disconnect the accelerator from the action, not from

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index e4d96d88a678d5c0915a411ef3b77570f475ee8e..adb3c952440e6ad08b079730cb891dcd035f50de 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -288,7 +288,6 @@ static void
 gtk_action_finalize (GObject *object)
 {
   GtkAction *action;
-
   action = GTK_ACTION (object);
 
   g_free (action->private_data->name);
@@ -297,7 +296,7 @@ gtk_action_finalize (GObject *object)
   g_free (action->private_data->tooltip);
   g_free (action->private_data->stock_id);
 
-  g_object_unref (action->private_data->accel_closure);
+  g_closure_unref (action->private_data->accel_closure);
   if (action->private_data->accel_group)
     g_object_unref (action->private_data->accel_group);
 }