update

2003-04-27  Marco Pesenti Gritti  <marco@it.gnome.org>

	* lib/egg/egg-editable-toolbar.c:
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-toolbar-editor.c:
	* lib/egg/egg-toolbars-model.c:
	* lib/egg/egg-toolbars-model.h:
	* lib/egg/eggtoolbar.c:

	update

	* src/ephy-shell.c: (save_toolbars),
	(ephy_shell_get_toolbars_model):
	* src/ephy-toolbars-model.c: (impl_add_item),
	(ephy_toolbars_model_class_init):
	* src/ephy-toolbars-model.h:
	* src/toolbar.c: (action_request_cb), (init_bookmarks_toolbar),
	(toolbar_set_window):

	Load the toolbars model in EphyShell so bookmarks editor
	alone can use it.
	Update the actions on a new editable toolbar signal,
	actions are per toolbar, not per model.

1 files changed, 21 insertions, 1 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 1975d0f7c..1e4bed077 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -287,7 +287,7 @@ save_toolbars (EggToolbarsModel *model)
 	char *xml_file;
 
 	xml_file = g_build_filename (ephy_dot_dir (),
-                                     "toolbar.xml",
+                                     "ephy-toolbar.xml",
                                      NULL);
 	egg_toolbars_model_save (model, xml_file);
 	g_free (xml_file);
@@ -654,7 +654,27 @@ ephy_shell_get_toolbars_model (EphyShell *gs)
 {
 	if (gs->priv->toolbars_model == NULL)
 	{
+		char *xml_file;
+		EggToolbarsModel *model;
+
 		gs->priv->toolbars_model = ephy_toolbars_model_new ();
+		model = EGG_TOOLBARS_MODEL (gs->priv->toolbars_model);
+
+		xml_file = g_build_filename (ephy_dot_dir (),
+		                             "ephy-toolbar.xml",
+		                             NULL);
+		if (g_file_test (xml_file, G_FILE_TEST_EXISTS))
+		{
+			egg_toolbars_model_load (model, xml_file);
+		}
+		else
+		{
+			const char *default_xml;
+
+			default_xml = ephy_file ("epiphany-toolbar.xml");
+			egg_toolbars_model_load (model, default_xml);
+		}
+		g_free (xml_file);
 	}
 
 	return gs->priv->toolbars_model;