aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg
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 /lib/egg
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 'lib/egg')
-rwxr-xr-xlib/egg/egg-toolbars-model.c6
-rwxr-xr-xlib/egg/egg-toolbars-model.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index 091604087..7fbafe99c 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -431,7 +431,7 @@ parse_toolbars (EggToolbarsModel *t,
}
}
-void
+gboolean
egg_toolbars_model_load (EggToolbarsModel *t,
const char *xml_file)
{
@@ -444,7 +444,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);
@@ -452,6 +452,8 @@ egg_toolbars_model_load (EggToolbarsModel *t,
parse_toolbars (t, root->children);
xmlFreeDoc (doc);
+
+ return TRUE;
}
static 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,