luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

gpropertyaction: Split dispose/finalize

Browse Source 
This avoids a critical warning from trying to disconnect a signal
handler from a `NULL` object if `paction->object` is `NULL` for whatever
reason (see: the following commit).

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #3130
This commit is contained in:
Philip Withnall 2023-10-02 15:20:25 +01:00
parent 722dba7ccf
commit 525508be0d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/gpropertyaction.c
View File

@ -407,13 +407,25 @@ g_property_action_get_property (GObject *object,
} }
} }
static void
g_property_action_dispose (GObject *object)
{
GPropertyAction *paction = G_PROPERTY_ACTION (object);
if (paction->object != NULL)
{
g_signal_handlers_disconnect_by_func (paction->object, g_property_action_notify, paction);
g_clear_object (&paction->object);
}
G_OBJECT_CLASS (g_property_action_parent_class)->dispose (object);
}
static void static void
g_property_action_finalize (GObject *object) g_property_action_finalize (GObject *object)
{ {
GPropertyAction *paction = G_PROPERTY_ACTION (object); GPropertyAction *paction = G_PROPERTY_ACTION (object);
g_signal_handlers_disconnect_by_func (paction->object, g_property_action_notify, paction);
g_object_unref (paction->object);
g_free (paction->name); g_free (paction->name);
G_OBJECT_CLASS (g_property_action_parent_class) G_OBJECT_CLASS (g_property_action_parent_class)
@ -445,6 +457,7 @@ g_property_action_class_init (GPropertyActionClass *class)
object_class->set_property = g_property_action_set_property; object_class->set_property = g_property_action_set_property;
object_class->get_property = g_property_action_get_property; object_class->get_property = g_property_action_get_property;
object_class->dispose = g_property_action_dispose;
object_class->finalize = g_property_action_finalize; object_class->finalize = g_property_action_finalize;
/** /**