diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-06-12 00:14:59 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-06-12 00:14:59 +0800 |
| commit | d3938a1cec5e2520289e37ff1ce5e2f808c97f03 (patch) | |
| tree | 9bbe3b9627571500cc8ad9184de7720054297c8d /src/bookmarks/ephy-bookmarks.c | |
| parent | bf52ee9c4c4c1882ecd6bc72719c4361ad535d11 (diff) | |
| download | gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar.gz gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar.bz2 gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar.lz gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar.xz gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.tar.zst gsoc2013-epiphany-d3938a1cec5e2520289e37ff1ce5e2f808c97f03.zip | |
Save the toolbars models from dispose, not from finalize, since you cannot
2004-06-11 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_finalize):
* src/bookmarks/ephy-bookmarksbar-model.c:
(ephy_bookmarksbar_model_dispose),
(ephy_bookmarksbar_model_finalize),
(ephy_bookmarksbar_model_class_init):
* src/ephy-toolbars-model.c: (ephy_toolbars_model_dispose),
(ephy_toolbars_model_finalize), (ephy_toolbars_model_class_init):
Save the toolbars models from dispose, not from finalize, since you
cannot emit signals from the latter (the get_item_* signals are
emitted while saving).
Diffstat (limited to 'src/bookmarks/ephy-bookmarks.c')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index be9884956..84c84f92c 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -809,6 +809,13 @@ ephy_bookmarks_finalize (GObject *object) ephy_bookmarks_save (eb); + /* have to do this before unreffing the nodes */ + LOG ("Unref bookmarks toolbars model") + if (eb->priv->toolbars_model != NULL) + { + g_object_unref (eb->priv->toolbars_model); + } + ephy_node_unref (eb->priv->bookmarks); ephy_node_unref (eb->priv->keywords); ephy_node_unref (eb->priv->favorites); @@ -816,12 +823,6 @@ ephy_bookmarks_finalize (GObject *object) g_object_unref (eb->priv->db); - LOG ("Unref bookmarks toolbars model") - if (eb->priv->toolbars_model != NULL) - { - g_object_unref (eb->priv->toolbars_model); - } - g_free (eb->priv->xml_file); g_free (eb->priv->rdf_file); |