From be872c7f830e2789c9dd5968b2a66d7ddf06f60b Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Thu, 25 Oct 2007 20:01:09 +0000 Subject: Move file_monitor_cancel on dispose from EphyTab to EphyEmbed. svn path=/trunk/; revision=7563 --- embed/mozilla/mozilla-embed.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'embed/mozilla/mozilla-embed.cpp') diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 16ef8245f..3e5c926ec 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -56,6 +56,7 @@ static void mozilla_embed_class_init (MozillaEmbedClass *klass); static void mozilla_embed_init (MozillaEmbed *gs); static void mozilla_embed_destroy (GtkObject *object); static void mozilla_embed_finalize (GObject *object); +static void mozilla_embed_dispose (GObject *object); static void ephy_embed_iface_init (EphyEmbedIface *iface); static void mozilla_embed_location_changed_cb (GtkMozEmbed *embed, @@ -108,6 +109,7 @@ static void mozilla_embed_favicon_cb (EphyEmbed *embed, static gboolean mozilla_embed_open_uri_cb (EphyEmbed *embed, const char *uri, MozillaEmbed *membed); +static void mozilla_embed_file_monitor_cancel (MozillaEmbed *embed); static void impl_set_typed_address (EphyEmbed *embed, const char *address, EphyEmbedAddressExpire expire); @@ -375,6 +377,7 @@ mozilla_embed_class_init (MozillaEmbedClass *klass) object_class->constructor = mozilla_embed_constructor; object_class->finalize = mozilla_embed_finalize; + object_class->dispose = mozilla_embed_dispose; object_class->get_property = mozilla_embed_get_property; object_class->set_property = mozilla_embed_set_property; @@ -491,6 +494,14 @@ mozilla_embed_destroy (GtkObject *object) GTK_OBJECT_CLASS (mozilla_embed_parent_class)->destroy (object); } +static void +mozilla_embed_dispose (GObject *object) +{ + mozilla_embed_file_monitor_cancel (MOZILLA_EMBED (object)); + + G_OBJECT_CLASS (mozilla_embed_parent_class)->dispose (object); +} + static void mozilla_embed_finalize (GObject *object) { -- cgit v1.2.3