debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disconnect boolean and string property proxy callbacks on destroy

Browse source 
This fixes critical warnings seen when opening and closing
multiple windows, which led notification callbacks to be invoked
on invalid widgets.
This commit is contained in:
Enrico Tröger 2009-06-01 03:43:36 +02:00 committed by Christian Dywan
parent d878298f8c
commit c182e4f788
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
katze/katze-utils.c
View file

@ -129,6 +129,22 @@ proxy_object_notify_string_cb (GObject* object,
g_free (value); g_free (value);
} }
static void
proxy_widget_boolean_destroy_cb (GtkWidget* proxy,
GObject* object)
{
g_signal_handlers_disconnect_by_func (object,
proxy_object_notify_boolean_cb, proxy);
}
static void
proxy_widget_string_destroy_cb (GtkWidget* proxy,
GObject* object)
{
g_signal_handlers_disconnect_by_func (object,
proxy_object_notify_string_cb, proxy);
}
/** /**
* katze_property_proxy: * katze_property_proxy:
* @object: a #GObject * @object: a #GObject
@ -208,6 +224,8 @@ katze_property_proxy (gpointer object,
notify_property = g_strdup_printf ("notify::%s", property); notify_property = g_strdup_printf ("notify::%s", property);
g_signal_connect (object, notify_property, g_signal_connect (object, notify_property,
G_CALLBACK (proxy_object_notify_boolean_cb), widget); G_CALLBACK (proxy_object_notify_boolean_cb), widget);
g_signal_connect (widget, "destroy",
G_CALLBACK (proxy_widget_boolean_destroy_cb), object);
g_free (notify_property); g_free (notify_property);
} }
else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file"))
@ -300,6 +318,8 @@ katze_property_proxy (gpointer object,
notify_property = g_strdup_printf ("notify::%s", property); notify_property = g_strdup_printf ("notify::%s", property);
g_signal_connect (object, notify_property, g_signal_connect (object, notify_property,
G_CALLBACK (proxy_object_notify_string_cb), widget); G_CALLBACK (proxy_object_notify_string_cb), widget);
g_signal_connect (widget, "destroy",
G_CALLBACK (proxy_widget_string_destroy_cb), object);
g_free (notify_property); g_free (notify_property);
} }
else if (type == G_TYPE_PARAM_FLOAT) else if (type == G_TYPE_PARAM_FLOAT)