[nautilus] desktop: fix context menu items not showing on the desktop

[Cosimo Cecchi <cosimoc src gnome org>]

commit d4a2f6e0531283bf943052812ca09610a3dd072d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Aug 9 17:15:06 2012 +0200

    desktop: fix context menu items not showing on the desktop
    
    This fixes missing e.g. Change Desktop Background and Empty Trash on the
    desktop. It was broken due to the icon->canvas big rename.

 src/Makefile.am                       |    2 +-
 src/nautilus-desktop-canvas-view.xml  |   20 ++++++++++++++++++++
 src/nautilus-desktop-icon-view-ui.xml |   20 --------------------
 src/nautilus.gresource.xml            |    2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7254b19..2141776 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,8 +58,8 @@ UI_FILES = \
 	nautilus-bookmarks-window.ui		\
 	nautilus-file-management-properties.ui	\
 	nautilus-canvas-view-ui.xml		\
+	nautilus-desktop-canvas-view-ui.xml	\
 	nautilus-directory-view-ui.xml		\
-	nautilus-desktop-icon-view-ui.xml	\
 	nautilus-list-view-ui.xml		\
 	nautilus-shell-ui.xml			\
 	$(NULL)
diff --git a/src/nautilus-desktop-canvas-view.xml b/src/nautilus-desktop-canvas-view.xml
new file mode 100644
index 0000000..410bb8d
--- /dev/null
+++ b/src/nautilus-desktop-canvas-view.xml
@@ -0,0 +1,20 @@
+<ui>
+<popup name="background">
+  <placeholder name="Before Zoom Items">
+    <placeholder name="New Window Items">
+    </placeholder>
+    <placeholder name="New Object Items">
+    </placeholder>
+  </placeholder>
+  <placeholder name="After Zoom Items">
+    <placeholder name="Background Items">
+      <menuitem name="Change Background" action="Change Background"/>
+    </placeholder>
+  </placeholder>
+</popup>
+<popup name="selection">
+  <placeholder name="Empty Trash Holder">
+    <menuitem name="Empty Trash" action="Empty Trash Conditional"/>
+  </placeholder>
+</popup>
+</ui>
diff --git a/src/nautilus.gresource.xml b/src/nautilus.gresource.xml
index 996d5eb..62f8e11 100644
--- a/src/nautilus.gresource.xml
+++ b/src/nautilus.gresource.xml
@@ -4,8 +4,8 @@
     <file compressed="true">nautilus-bookmarks-window.ui</file>
     <file compressed="true">nautilus-file-management-properties.ui</file>
     <file>nautilus-canvas-view-ui.xml</file>
+    <file>nautilus-desktop-canvas-view-ui.xml</file>
     <file>nautilus-directory-view-ui.xml</file>
-    <file>nautilus-desktop-icon-view-ui.xml</file>
     <file>nautilus-list-view-ui.xml</file>
     <file>nautilus-shell-ui.xml</file>
     <file>nautilus-app-menu.ui</file>