callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2003-09-18 19:04:42 +00:00 committed by Matthias Clasen
parent 0ceb0db081
commit 8a72d4b383
6 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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

11
ChangeLog.pre-2-10
View File

@ -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

11
ChangeLog.pre-2-4
View File

@ -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

11
ChangeLog.pre-2-6
View File

@ -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

11
ChangeLog.pre-2-8
View File

@ -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

3
gtk/gtkaction.c
View File

@ -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);
}