aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2007-10-26 04:01:09 +0800
committerXan Lopez <xan@src.gnome.org>2007-10-26 04:01:09 +0800
commitbe872c7f830e2789c9dd5968b2a66d7ddf06f60b (patch)
treea00377f58d045c1131ded1f323f3ee0941524b52
parent6638472fdbeee7c135c822ada01d09f407ca18e6 (diff)
downloadgsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar.gz
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar.bz2
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar.lz
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar.xz
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.tar.zst
gsoc2013-epiphany-be872c7f830e2789c9dd5968b2a66d7ddf06f60b.zip
Move file_monitor_cancel on dispose from EphyTab to EphyEmbed.
svn path=/trunk/; revision=7563
-rw-r--r--embed/mozilla/mozilla-embed.cpp11
-rw-r--r--src/ephy-tab.c2
2 files changed, 11 insertions, 2 deletions
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;
@@ -492,6 +495,14 @@ mozilla_embed_destroy (GtkObject *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)
{
MozillaEmbed *embed = MOZILLA_EMBED (object);
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 3f0db4291..03ec35136 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -614,8 +614,6 @@ ephy_tab_dispose (GObject *object)
priv->idle_resize_handler = 0;
}
- ephy_tab_file_monitor_cancel (tab);
-
G_OBJECT_CLASS (parent_class)->dispose (object);
}