reviewed by: Darin Adler <darin@eazel.com>

	Final changes to kill off the legendary bug 3579
	(Convert directory view context menus to use Bonobo)

	* libnautilus/nautilus-bonobo-ui.h:
	#define for zoom items placeholder in popup. Remove
	#defines for popup-specific zooming commands, since now
	we don't need distinct popup-specific ones.

	* libnautilus-extensions/nautilus-bonobo-extensions.h:
	* libnautilus-extensions/nautilus-bonobo-extensions.c:
	(nautilus_bonobo_set_label_for_menu_item_and_command):
	Moved this here and commented; it had been a private
	function in fm-directory-view.c.

	* src/file-manager/fm-directory-view.c:
	(real_merge_menus): Just hide the placeholder for the zoom items,
	which is now sufficient due to a Bonobo fix Darin made.
	(real_update_menus): Update for API name change.
	(set_label_for_menu_and_command): Moved this to another file
	and renamed it.
	* src/file-manager/fm-icon-view.c:
	(fm_icon_view_update_menus): Update the dynamic menu items
	in-line here, as was done with fm-directory-view.c in an earlier
	checkin.
	(compute_menu_item_info), (update_one_menu_item): Removed these
	obsolete functions.
	* src/nautilus-shell-ui.xml: Eliminated special pop-up versions of
	zoom commands. They existed only to allow hiding without affecting
	the menu-bar versions, but now that placeholders can be hidden
	these aren't necessary.
	* src/nautilus-window-menus.c: (nautilus_window_initialize_menus):
	Removed verb installation for pop-up versions of zoom commands.

1 files changed, 3 insertions, 4 deletions

diff --git a/libnautilus/nautilus-bonobo-ui.h b/libnautilus/nautilus-bonobo-ui.h
index ec27d17e3..41fa3747d 100644
--- a/libnautilus/nautilus-bonobo-ui.h
+++ b/libnautilus/nautilus-bonobo-ui.h
@@ -62,10 +62,6 @@
 #define NAUTILUS_COMMAND_CLEAR				"/commands/Clear"
 #define NAUTILUS_COMMAND_SELECT_ALL			"/commands/Select All"
 
-#define NAUTILUS_COMMAND_ZOOM_IN_FROM_POPUP		"/commands/Zoom In Popup"
-#define NAUTILUS_COMMAND_ZOOM_OUT_FROM_POPUP		"/commands/Zoom Out Popup"
-#define NAUTILUS_COMMAND_ZOOM_NORMAL_FROM_POPUP		"/commands/Zoom Normal Popup"
-
 /** 
  * Components can use these placeholder paths with BonoboUIContainer calls to 
  * insert new items in well-defined positions. 
@@ -119,6 +115,9 @@
 /* Use the "extra help items" placeholder to add help-related items */
 #define NAUTILUS_MENU_PATH_EXTRA_HELP_ITEMS_PLACEHOLDER	"/menu/Help/Extra Help Items"
 
+/* This holds the zooming-related items in the context menu */
+#define NAUTILUS_POPUP_PATH_ZOOM_ITEMS_PLACEHOLDER	"/popups/background/Zoom Items"
+
 /* Components can use these paths with BonoboUIHandler calls to
  * locate toolbars and toolbar items for the purpose of merging.
  * Note: Not all Nautilus toolbars or toolbar items are necessarily published