diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-10-14 08:37:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-10-14 08:37:32 +0800 |
| commit | 890f31bd076da194c5b7ea8022e72c8aad4a0de1 (patch) | |
| tree | 376cb5e9c7e5c42be62c04c5ebac36e1204eab1b /mail | |
| parent | 446cd75900b3636156a92f764cb2db5306b687ec (diff) | |
| download | gsoc2013-evolution-890f31bd076da194c5b7ea8022e72c8aad4a0de1.tar.gz gsoc2013-evolution-890f31bd076da194c5b7ea8022e72c8aad4a0de1.tar.zst gsoc2013-evolution-890f31bd076da194c5b7ea8022e72c8aad4a0de1.zip | |
Bug 685786 - EWebView: Signal handlers never disconnected
Both EWebView and EMailDisplay listen for "changed" signals from a
GSettings instance, passing itself as the 'user_data' to the signal
handler e_web_view_update_fonts(). But in both cases the signal
handler was left connected after EWebView and EMailDisplay were
finalized, resulting in the signal handler receiving a dangling pointer.
Not using g_signal_connect_object() here because of the unresolved
reference leak issue in GObject. The GSettings instance is likely
cached internally and lives well beyond EWebView and EMailDisplay.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-display.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 82934ea642..5e33ccd570 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1313,8 +1313,15 @@ mail_display_dispose (GObject *object) priv->widgets = NULL; } + if (priv->settings != NULL) { + g_signal_handlers_disconnect_matched ( + priv->settings, G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, object); + g_object_unref (priv->settings); + priv->settings = NULL; + } + g_clear_object (&priv->part_list); - g_clear_object (&priv->settings); g_clear_object (&priv->formatter); /* Chain up to parent's dispose() method. */ |