From fa7475f9cbfa736852e3670bb7e35997716cc7fb Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 10 Nov 2003 01:40:52 +0000 Subject: Release 1.0.6 --- ChangeLog | 21 +++++++++++++++++++++ lib/egg/egg-toolbars-model.c | 6 ++++-- lib/egg/egg-toolbars-model.h | 2 +- src/ephy-toolbars-model.c | 6 ++++-- src/session.c | 9 +++++++-- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9ac4ab00..991ea3b46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2003-11-09 Christian Persch + + * src/session.c: (save_tab): + + Encode entities when saving the session file. + +2003-11-09 Christian Persch + + * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_load): + * lib/egg/egg-toolbars-model.h: + * src/ephy-toolbars-model.c: (ephy_toolbars_model_set_bookmarks): + + Fix recovery from corrupted toolbar layout file. + +2003-11-09 Christian Persch + + * src/bookmarks/ephy-bookmarks-export.c: (add_topics_list), + (ephy_bookmarks_export_rdf): + + Encode entities when exporting to RDF. + 2003-11-09 Christian Persch * src/session.c: (session_save): diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c index d9c3ab832..d28e95ec6 100755 --- a/lib/egg/egg-toolbars-model.c +++ b/lib/egg/egg-toolbars-model.c @@ -423,7 +423,7 @@ parse_toolbars (EggToolbarsModel *t, } } -void +gboolean egg_toolbars_model_load (EggToolbarsModel *t, const char *xml_file) { @@ -436,7 +436,7 @@ egg_toolbars_model_load (EggToolbarsModel *t, if (doc == NULL) { g_warning ("Failed to load XML data from %s", xml_file); - return; + return FALSE; } root = xmlDocGetRootElement (doc); @@ -444,6 +444,8 @@ egg_toolbars_model_load (EggToolbarsModel *t, parse_toolbars (t, root->children); xmlFreeDoc (doc); + + return TRUE; } char * diff --git a/lib/egg/egg-toolbars-model.h b/lib/egg/egg-toolbars-model.h index baf4b6ac6..0f3b2d31a 100755 --- a/lib/egg/egg-toolbars-model.h +++ b/lib/egg/egg-toolbars-model.h @@ -87,7 +87,7 @@ struct EggToolbarsModelClass GType egg_toolbars_model_get_type (void); EggToolbarsModel *egg_toolbars_model_new (void); -void egg_toolbars_model_load (EggToolbarsModel *t, +gboolean egg_toolbars_model_load (EggToolbarsModel *t, const char *xml_file); void egg_toolbars_model_save (EggToolbarsModel *t, const char *xml_file, diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c index 6384b06e5..f0667994f 100755 --- a/src/ephy-toolbars-model.c +++ b/src/ephy-toolbars-model.c @@ -321,6 +321,7 @@ static void ephy_toolbars_model_set_bookmarks (EphyToolbarsModel *model, EphyBookmarks *bookmarks) { EggToolbarsModel *egg_model = EGG_TOOLBARS_MODEL (model); + gboolean success = FALSE; model->priv->bookmarks = bookmarks; g_object_ref (model->priv->bookmarks); @@ -329,10 +330,11 @@ ephy_toolbars_model_set_bookmarks (EphyToolbarsModel *model, EphyBookmarks *book if (g_file_test (model->priv->xml_file, G_FILE_TEST_EXISTS)) { - egg_toolbars_model_load (egg_model, + success = egg_toolbars_model_load (egg_model, model->priv->xml_file); } - else + + if (success == FALSE) { const char *default_xml; diff --git a/src/session.c b/src/session.c index acace9d63..b5bf34d66 100644 --- a/src/session.c +++ b/src/session.c @@ -467,6 +467,7 @@ save_tab (EphyWindow *window, const char *title; xmlNodePtr embed_node; EphyEmbed *embed; + xmlChar *encoded_link, *encoded_title; chrome = ephy_window_get_chrome (window); @@ -479,12 +480,16 @@ save_tab (EphyWindow *window, /* store title in the node */ title = ephy_tab_get_title (tab); - xmlSetProp (embed_node, "title", title); + encoded_title = xmlEncodeEntitiesReentrant (doc, title); + xmlSetProp (embed_node, "title", encoded_title); + xmlFree (encoded_title); /* otherwise, use the actual location. */ embed = ephy_tab_get_embed (tab); ephy_embed_get_location (embed, TRUE, &location); - xmlSetProp (embed_node, "url", location); + encoded_link = xmlEncodeEntitiesReentrant (doc, location); + xmlSetProp (embed_node, "url", encoded_link); + xmlFree (encoded_link); g_free (location); /* insert node into the tree */ -- cgit v1.2.3