diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2003-08-24 Christian Persch <chpe@cvs.gnome.org> + + * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_load): + + Fix the logic in the version-mismatch case. + 2003-08-24 Anders Carlsson <andersca@gnome.org> * src/ephy-spinner-action.c (toolbar_style_sync): Use a diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 2ba82aa78..036113673 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -324,17 +324,19 @@ ephy_bookmarks_load (EphyBookmarks *eb) g_return_val_if_fail (doc != NULL, FALSE); root = xmlDocGetRootElement (doc); - + child = root->children; + tmp = xmlGetProp (root, "version"); if (tmp != NULL && strcmp (tmp, EPHY_BOOKMARKS_XML_VERSION) != 0) { g_warning ("Old bookmarks database format detected"); + child = NULL; result = FALSE; } g_free (tmp); - for (child = root->children; child != NULL; child = child->next) + for (; child != NULL; child = child->next) { EphyNode *node; |