Work on bug 3496 (labels in menu items never change)

	Work on bug 3495 (menu item sensitivity never changes)
	Fixed bug 3503 ("Delete from Trash" never appears)

	* libnautilus-extensions/nautilus-bonobo-extensions.h:
	* libnautilus-extensions/nautilus-bonobo-extensions.c:
	(nautilus_bonobo_set_accelerator),
	(nautilus_bonobo_set_description): More new wrappers for
	xml shenanigans.

	* libnautilus/nautilus-bonobo-ui.h:
	* src/file-manager/fm-directory-view.h:
	Updated #defines for menu paths to match new syntax (start
	with "/menu", include placeholder names)

	* src/file-manager/fm-directory-view.c:
	Store the BonoboUIComponent in FMDirectoryViewDetails.
	(fm_directory_view_real_create_selection_context_menu_items),
	(reset_bonobo_trash_delete_menu),
	(compute_menu_item_info): merge "Move to Trash" and
	"Delete from Trash" into single item.
	(update_one_menu_item): Use new-style Bonobo calls.
	(fm_directory_view_real_merge_menus): Remove old #ifddeffed code.
	(fm_directory_view_real_update_menus): #ifdef guts back
	in, and remove UIHandler references.
	* src/file-manager/nautilus-directory-view-ui.xml: Fixed typo
	in "Open in New Window" label.
	* src/nautilus-window-menus.c:
	(nautilus_window_update_find_menu_item): Removed stray debugging
	comment.

1 files changed, 23 insertions, 23 deletions

diff --git a/libnautilus/nautilus-bonobo-ui.h b/libnautilus/nautilus-bonobo-ui.h
index 730b3db88..991170520 100644
--- a/libnautilus/nautilus-bonobo-ui.h
+++ b/libnautilus/nautilus-bonobo-ui.h
@@ -31,82 +31,82 @@
 #define NAUTILUS_BONOBO_UI_H
 
 /** 
- * Components can use these menu paths with BonoboUIHandler calls to 
+ * Components can use these menu paths with BonoboUIContainer calls to 
  * place entire new menus. 
  */
 
-#define NAUTILUS_MENU_PATH_FILE_MENU			"/File"
-#define NAUTILUS_MENU_PATH_EDIT_MENU			"/Edit"
-#define NAUTILUS_MENU_PATH_VIEW_MENU			"/View"
-#define NAUTILUS_MENU_PATH_GO_MENU			"/Go"
-#define NAUTILUS_MENU_PATH_BOOKMARKS_MENU		"/Bookmarks"
-#define NAUTILUS_MENU_PATH_HELP_MENU			"/Help"
+#define NAUTILUS_MENU_PATH_FILE_MENU			"/menu/File"
+#define NAUTILUS_MENU_PATH_EDIT_MENU			"/menu/Edit"
+#define NAUTILUS_MENU_PATH_VIEW_MENU			"/menu/View"
+#define NAUTILUS_MENU_PATH_GO_MENU			"/menu/Go"
+#define NAUTILUS_MENU_PATH_BOOKMARKS_MENU		"/menu/Bookmarks"
+#define NAUTILUS_MENU_PATH_HELP_MENU			"/menu/Help"
 
 /** 
- * Components can use these menu item paths with BonoboUIHandler calls to 
+ * Components can use these menu item paths with BonoboUIContainer calls to 
  * merge over certain existing items. Only items that we expect to be
  * merged over are listed here, to avoid making public details that might
  * change later. 
  */
 
-#define NAUTILUS_MENU_PATH_CUT_ITEM			"/Edit/Cut"
-#define NAUTILUS_MENU_PATH_COPY_ITEM			"/Edit/Copy"
-#define NAUTILUS_MENU_PATH_PASTE_ITEM			"/Edit/Paste"
-#define NAUTILUS_MENU_PATH_CLEAR_ITEM			"/Edit/Clear"
-#define NAUTILUS_MENU_PATH_SELECT_ALL_ITEM		"/Edit/Select All"
+#define NAUTILUS_MENU_PATH_CUT_ITEM			"/menu/Edit/Cut"
+#define NAUTILUS_MENU_PATH_COPY_ITEM			"/menu/Edit/Copy"
+#define NAUTILUS_MENU_PATH_PASTE_ITEM			"/menu/Edit/Paste"
+#define NAUTILUS_MENU_PATH_CLEAR_ITEM			"/menu/Edit/Clear"
+#define NAUTILUS_MENU_PATH_SELECT_ALL_ITEM		"/menu/Edit/Select All"
 
 /** 
- * Components can use these placeholder paths with BonoboUIHandler calls to 
+ * Components can use these placeholder paths with BonoboUIContainer calls to 
  * insert new items in well-defined positions. 
  */
 
 /* Use the "new items" placeholder to insert menu items like "New xxx" */
-#define NAUTILUS_MENU_PATH_NEW_ITEMS_PLACEHOLDER	"/File/New Items Placeholder"
+#define NAUTILUS_MENU_PATH_NEW_ITEMS_PLACEHOLDER	"/menu/File/New Items Placeholder"
 
 /**
  * Use the "open" placeholder to insert menu items dealing with opening the
  * selected item, like "Open", "Open in New Window", etc.
  */
-#define NAUTILUS_MENU_PATH_OPEN_PLACEHOLDER		"/File/Open Placeholder"
+#define NAUTILUS_MENU_PATH_OPEN_PLACEHOLDER		"/menu/File/Open Placeholder"
 
 /**
  * Use the "file items" placeholder to insert other File menu items dealing with
  * individual files, such as "Show Properties" and "Rename"
  */
-#define NAUTILUS_MENU_PATH_FILE_ITEMS_PLACEHOLDER	"/File/File Items Placeholder"
+#define NAUTILUS_MENU_PATH_FILE_ITEMS_PLACEHOLDER	"/menu/File/File Items Placeholder"
 
 /**
  * Use the "global file items" placeholder to insert other File menu items 
  * dealing with nautilus as a whole, such as "Empty Trash".
  */
-#define NAUTILUS_MENU_PATH_GLOBAL_FILE_ITEMS_PLACEHOLDER "/File/Global File Items Placeholder"
+#define NAUTILUS_MENU_PATH_GLOBAL_FILE_ITEMS_PLACEHOLDER "/menu/File/Global File Items Placeholder"
 
 /**
  * Use the "global edit items" placeholder to insert other Edit menu items 
  * dealing with nautilus as a whole, such as "Icon Captions...".
  */
-#define NAUTILUS_MENU_PATH_GLOBAL_EDIT_ITEMS_PLACEHOLDER "/Edit/Global Edit Items Placeholder"
+#define NAUTILUS_MENU_PATH_GLOBAL_EDIT_ITEMS_PLACEHOLDER "/menu/Edit/Global Edit Items Placeholder"
 
 /**
  * Use the "edit items" placeholder to insert other Edit menu items dealing with
  * individual files, such as "Remove Custom Image"
  */
-#define NAUTILUS_MENU_PATH_EDIT_ITEMS_PLACEHOLDER	"/Edit/Edit Items Placeholder"
+#define NAUTILUS_MENU_PATH_EDIT_ITEMS_PLACEHOLDER	"/menu/Edit/Edit Items Placeholder"
 
 /**
  * Use the "show/hide" placeholder to insert other View menu items that
  * control the visibility of some piece of the UI, such as "Show/Hide Status Bar".
  */
-#define NAUTILUS_MENU_PATH_SHOW_HIDE_PLACEHOLDER	"/View/Show Hide Placeholder"
+#define NAUTILUS_MENU_PATH_SHOW_HIDE_PLACEHOLDER	"/menu/View/Show Hide Placeholder"
 
 /**
  * Use the "view items" placeholder to insert other View menu items that
  * are specific to a component, such as the Icon View's layout options.
  */
-#define NAUTILUS_MENU_PATH_VIEW_ITEMS_PLACEHOLDER	"/View/View Items Placeholder"
+#define NAUTILUS_MENU_PATH_VIEW_ITEMS_PLACEHOLDER	"/menu/View/View Items Placeholder"
 
 /* Use the "extra help items" placeholder to add help-related items */
-#define NAUTILUS_MENU_PATH_EXTRA_HELP_ITEMS_PLACEHOLDER	"/Help/Extra Help Items"
+#define NAUTILUS_MENU_PATH_EXTRA_HELP_ITEMS_PLACEHOLDER	"/menu/Help/Extra Help Items"
 
 
 /* Components can use these paths with BonoboUIHandler calls to