Fix object property naming leftover from EggMenuMerge days, to UI manager.

2004-08-09  Christian Persch  <chpe@cvs.gnome.org>

	* lib/egg/egg-editable-toolbar.c: (find_action),
	(egg_editable_toolbar_construct), (egg_editable_toolbar_set_model),
	(egg_editable_toolbar_set_ui_manager),
	(egg_editable_toolbar_set_property),
	(egg_editable_toolbar_get_property),
	(egg_editable_toolbar_class_init), (egg_editable_toolbar_finalize),
	(egg_editable_toolbar_new), (egg_editable_toolbar_new_with_model),
	(egg_editable_toolbar_get_model):
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-toolbar-editor.c: (find_action),
	(egg_toolbar_editor_set_ui_manager),
	(egg_toolbar_editor_set_property),
	(egg_toolbar_editor_get_property), (egg_toolbar_editor_class_init),
	(egg_toolbar_editor_finalize), (egg_toolbar_editor_new),
	(egg_toolbar_editor_init):
	* lib/egg/egg-toolbar-editor.h:
	* src/bookmarks/ephy-bookmarksbar.c:
	(ephy_bookmarksbar_set_window):
	* src/toolbar.c: (toolbar_new):

	Fix object property naming leftover from EggMenuMerge days, to
	UI manager.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index 69f841b90..f6d6a49f3 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -299,8 +299,8 @@ ephy_bookmarksbar_set_window (EphyBookmarksBar *toolbar,
 					    toolbar->priv->action_group, -1);
 
 	g_object_set (G_OBJECT (toolbar),
-		      "MenuMerge", manager,
-		      "ToolbarsModel", model,
+		      "ui-manager", manager,
+		      "model", model,
 		      NULL);
 
 	g_signal_connect_after (model, "toolbar_added",
diff --git a/src/toolbar.c b/src/toolbar.c
index bcff8f91f..55e9b3dfb 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -470,7 +470,7 @@ toolbar_new (EphyWindow *window)
 {
 	return EPHY_TOOLBAR (g_object_new (EPHY_TYPE_TOOLBAR,
 					   "window", window,
-					   "MenuMerge", window->ui_merge,
+					   "ui-manager", window->ui_merge,
 					   NULL));
 }