aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-11-10 20:09:56 +0800
committerChristian Persch <chpe@src.gnome.org>2003-11-10 20:09:56 +0800
commite0e28a194f0b59712b096bbde4d6181739f1d975 (patch)
tree3cfe637e0b5b3198066a8a6e824c5ba7df9da520 /src
parent90a594297c72e0e4515e14fcbabec554be30b399 (diff)
downloadgsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar.gz
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar.bz2
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar.lz
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar.xz
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.tar.zst
gsoc2013-epiphany-e0e28a194f0b59712b096bbde4d6181739f1d975.zip
Fix recovery from corrupted toolbar layout file.
2003-11-10 Christian Persch <chpe@cvs.gnome.org> * 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.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/ephy-toolbars-model.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index c61f66161..f43acfb83 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -323,6 +323,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);
@@ -331,10 +332,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;