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.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h
index d0dfb9811..2aa087b5f 100755
--- a/lib/egg/egg-editable-toolbar.h
+++ b/lib/egg/egg-editable-toolbar.h
@@ -62,8 +62,8 @@ struct EggEditableToolbarClass
 };
 
 GType               egg_editable_toolbar_get_type        (void);
-GtkWidget	   *egg_editable_toolbar_new		 (GtkUIManager         *merge);
-GtkWidget	   *egg_editable_toolbar_new_with_model	 (GtkUIManager         *merge,
+GtkWidget	   *egg_editable_toolbar_new		 (GtkUIManager         *manager);
+GtkWidget	   *egg_editable_toolbar_new_with_model	 (GtkUIManager         *manager,
 							  EggToolbarsModel     *model);
 void		    egg_editable_toolbar_set_model       (EggEditableToolbar   *etoolbar,
 							  EggToolbarsModel     *model);