aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-08-28 18:21:06 +0800
committerChristian Persch <chpe@src.gnome.org>2004-08-28 18:21:06 +0800
commitf8d9f3f5d4d9f104118e87dddc3af8d43acb4f92 (patch)
treebcd538996968122bcaf119b229345ab3d80c215b
parent6908bbda3b2cb195d43f79e656273150380c0235 (diff)
downloadgsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar.gz
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar.bz2
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar.lz
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar.xz
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.tar.zst
gsoc2013-epiphany-f8d9f3f5d4d9f104118e87dddc3af8d43acb4f92.zip
Remove the save timeout on dispose.
2004-08-28 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarksbar-model.c: (ephy_bookmarksbar_model_init), (ephy_bookmarksbar_model_dispose), (ephy_bookmarksbar_model_finalize): Remove the save timeout on dispose.
-rw-r--r--ChangeLog8
-rwxr-xr-xsrc/bookmarks/ephy-bookmarksbar-model.c18
2 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e00a15c0c..3c5226f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2004-08-28 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmarksbar-model.c:
+ (ephy_bookmarksbar_model_init), (ephy_bookmarksbar_model_dispose),
+ (ephy_bookmarksbar_model_finalize):
+
+ Remove the save timeout on dispose.
+
+2004-08-28 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-window.c: (ephy_window_init):
Make sure to instantiate the toolbars model before instantiating the
diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c
index 5cb28a7f2..0bbcad7c5 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.c
+++ b/src/bookmarks/ephy-bookmarksbar-model.c
@@ -475,6 +475,8 @@ ephy_bookmarksbar_model_init (EphyBookmarksBarModel *model)
{
model->priv = EPHY_BOOKMARKSBAR_MODEL_GET_PRIVATE (model);
+ LOG ("EphyBookmarksBarModel initialising")
+
model->priv->xml_file = g_build_filename (ephy_dot_dir (),
EPHY_BOOKMARKSBARS_XML_FILE,
NULL);
@@ -494,6 +496,14 @@ ephy_bookmarksbar_model_dispose (GObject *object)
{
EphyBookmarksBarModel *model = EPHY_BOOKMARKSBAR_MODEL (object);
+ LOG ("EphyBookmarksBarModel disposing")
+
+ if (model->priv->timeout != 0)
+ {
+ g_source_remove (model->priv->timeout);
+ model->priv->timeout = 0;
+ }
+
save_changes_idle (model);
G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -504,14 +514,10 @@ ephy_bookmarksbar_model_finalize (GObject *object)
{
EphyBookmarksBarModel *model = EPHY_BOOKMARKSBAR_MODEL (object);
- if (model->priv->timeout != 0)
- {
- g_source_remove (model->priv->timeout);
- model->priv->timeout = 0;
- }
-
g_free (model->priv->xml_file);
+ LOG ("EphyBookmarksBarModel finalised")
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}