aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-05-24 05:06:13 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-05-24 05:06:13 +0800
commita98d9364cb5395aca5adc9fa4db219df7545ab98 (patch)
tree59c8fce41d8d0e2e720f433eca186ec4a307ac37 /src/bookmarks
parentbf20b4938c2e01f15d72dc2962c12400bb15d4d4 (diff)
downloadgsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar.gz
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar.bz2
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar.lz
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar.xz
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.tar.zst
gsoc2013-epiphany-a98d9364cb5395aca5adc9fa4db219df7545ab98.zip
Implement generic way to save/load db and make it low disk safe.
2003-05-23 Marco Pesenti Gritti <marco@it.gnome.org> * embed/ephy-favicon-cache.c: (ephy_favicon_cache_load), (ephy_favicon_cache_save), (ephy_favicon_cache_init), (ephy_favicon_cache_finalize): * embed/ephy-history.c: (ephy_history_load), (ephy_history_save), (ephy_history_init): * lib/ephy-node-db.c: (ephy_node_db_set_version), (ephy_node_db_get_property), (ephy_node_db_set_property), (ephy_node_db_class_init), (ephy_node_db_init), (ephy_node_db_finalize), (ephy_node_db_new), (_ephy_node_db_remove_id), (ephy_node_db_load_from_xml), (ephy_node_db_save_to_xml): * lib/ephy-node-db.h: * lib/ephy-node.c: (ephy_node_to_xml): * lib/ephy-node.h: * lib/ephy-state.c: (ephy_states_load), (ephy_states_save), (ensure_states): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_load), (ephy_bookmarks_save), (ephy_bookmarks_init), (ephy_bookmarks_finalize): Implement generic way to save/load db and make it low disk safe.
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks.c75
1 files changed, 5 insertions, 70 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index b43b1f981..dd747559e 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -265,82 +265,15 @@ ephy_bookmarks_init_defaults (EphyBookmarks *eb)
static gboolean
ephy_bookmarks_load (EphyBookmarks *eb)
{
- xmlDocPtr doc;
- xmlNodePtr root, child;
- char *tmp;
-
- if (g_file_test (eb->priv->xml_file, G_FILE_TEST_EXISTS) == FALSE)
- return FALSE;
-
- doc = xmlParseFile (eb->priv->xml_file);
- g_return_val_if_fail (doc != NULL, FALSE);
-
- root = xmlDocGetRootElement (doc);
-
- tmp = xmlGetProp (root, "version");
- g_assert (tmp != NULL && strcmp (tmp, EPHY_BOOKMARKS_XML_VERSION) == 0);
- g_free (tmp);
-
- for (child = root->children; child != NULL; child = child->next)
- {
- EphyNode *node;
-
- node = ephy_node_new_from_xml (eb->priv->db, child);
- }
-
- xmlFreeDoc (doc);
-
- return TRUE;
+ return ephy_node_db_load_from_xml (eb->priv->db, eb->priv->xml_file);
}
void
ephy_bookmarks_save (EphyBookmarks *eb)
{
- xmlDocPtr doc;
- xmlNodePtr root;
- GPtrArray *children;
- int i;
char *rdf_file;
- LOG ("Saving bookmarks")
-
- /* save nodes to xml */
- xmlIndentTreeOutput = TRUE;
- doc = xmlNewDoc ("1.0");
-
- root = xmlNewDocNode (doc, NULL, "ephy_bookmarks", NULL);
- xmlSetProp (root, "version", EPHY_BOOKMARKS_XML_VERSION);
- xmlDocSetRootElement (doc, root);
-
- children = ephy_node_get_children (eb->priv->keywords);
- for (i = 0; i < children->len; i++)
- {
- EphyNode *kid;
-
- kid = g_ptr_array_index (children, i);
-
- if (kid != eb->priv->bookmarks &&
- kid != eb->priv->favorites &&
- kid != eb->priv->notcategorized)
- {
- ephy_node_save_to_xml (kid, root);
- }
- }
- ephy_node_thaw (eb->priv->keywords);
-
- children = ephy_node_get_children (eb->priv->bookmarks);
- for (i = 0; i < children->len; i++)
- {
- EphyNode *kid;
-
- kid = g_ptr_array_index (children, i);
-
- ephy_node_save_to_xml (kid, root);
- }
- ephy_node_thaw (eb->priv->bookmarks);
-
- xmlSaveFormatFile (eb->priv->xml_file, doc, 1);
- xmlFreeDoc(doc);
+ ephy_node_db_save_to_xml (eb->priv->db, eb->priv->xml_file);
/* Export bookmarks in rdf */
rdf_file = g_build_filename (ephy_dot_dir (),
@@ -586,7 +519,7 @@ ephy_bookmarks_init (EphyBookmarks *eb)
eb->priv = g_new0 (EphyBookmarksPrivate, 1);
- db = ephy_node_db_new ("EphyBookmarks");
+ db = ephy_node_db_new ("EphyBookmarks", EPHY_BOOKMARKS_XML_VERSION);
eb->priv->db = db;
eb->priv->xml_file = g_build_filename (ephy_dot_dir (),
@@ -691,6 +624,8 @@ ephy_bookmarks_finalize (GObject *object)
ephy_node_unref (eb->priv->favorites);
ephy_node_unref (eb->priv->notcategorized);
+ g_object_unref (eb->priv->db);
+
g_free (eb->priv);
LOG ("Bookmarks finalized")