*** empty log message ***

2 files changed, 2 insertions, 9 deletions

diff --git a/TODO b/TODO
index bf40eca60..02e83ff0e 100644
--- a/TODO
+++ b/TODO
@@ -4,11 +4,9 @@ Bookmarks:
 - <campd> nautilus/libnautilus-private/nautilus-tree-view-drag-dest.c. Dest crashes.
 
 Others:
-- if you change mozilla settings when ephy is not running, they arent updated in prefs.js
 - downloader should resize when clicking details, so that the cursor is not moved away from the button
 - make popups less annoying
 - show when bookmarks has updated content
-- temporary bookmarks, maybe an expire checkbox in new bookmark dialog ? (I could be on crack here, would be nice to find a good solution though)
 
 Egg problems:
 - not translated
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 13890b89a..097b70d5c 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -32,7 +32,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
-#define EPHY_HISTORY_XML_VERSION "0.1"
+#define EPHY_HISTORY_XML_VERSION "1.0"
 
 /* how often to save the history, in milliseconds */
 #define HISTORY_SAVE_INTERVAL (60 * 5 * 1000)
@@ -201,7 +201,6 @@ ephy_history_load (EphyHistory *eb)
 {
 	xmlDocPtr doc;
 	xmlNodePtr root, child;
-	char *tmp;
 
 	if (g_file_test (eb->priv->xml_file, G_FILE_TEST_EXISTS) == FALSE)
 		return;
@@ -211,10 +210,6 @@ ephy_history_load (EphyHistory *eb)
 
 	root = xmlDocGetRootElement (doc);
 
-	tmp = xmlGetProp (root, "version");
-	g_assert (tmp != NULL && strcmp (tmp, EPHY_HISTORY_XML_VERSION) == 0);
-	g_free (tmp);
-
 	for (child = root->children; child != NULL; child = child->next)
 	{
 		EphyNode *node;
@@ -419,7 +414,7 @@ ephy_history_init (EphyHistory *eb)
 
         eb->priv = g_new0 (EphyHistoryPrivate, 1);
 
-	db = ephy_node_db_new ("EphyHistory");
+	db = ephy_node_db_new (EPHY_NODE_DB_HISTORY);
 	eb->priv->db = db;
 
 	eb->priv->xml_file = g_build_filename (ephy_dot_dir (),