[patch] move desktop specific entries for the trash and removable media into the mime section of the context menus

[Dave Bordoley <bordoley pilot msu edu>]

Pretty simple patch (but i probably screwed it up anyway) that moves
mime specific entries for desktop items (like the trash and removable
media) into the mime section of the context menu.

dave

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5752
diff -u -p -r1.5752 ChangeLog
--- ChangeLog	19 Mar 2003 15:51:02 -0000	1.5752
+++ ChangeLog	19 Mar 2003 21:22:03 -0000
@@ -1,3 +1,10 @@
+2003-03-19  David Bordoley <bordoley msu edu>
+
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
+	Move desktop specific menu entries (for trash and removable media) 
+	into the mime actions section, so the ui is more consistent.
+
 2003-03-19  Alexander Larsson  <alexl redhat com>
 
 	* libnautilus-private/nautilus-icon-container.c (select_one_unselect_others):
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.331
diff -u -p -r1.331 nautilus-icon-container.c
--- libnautilus-private/nautilus-icon-container.c	19 Mar 2003 15:51:06 -0000	1.331
+++ libnautilus-private/nautilus-icon-container.c	19 Mar 2003 21:22:47 -0000
@@ -100,7 +100,7 @@
 #define STANDARD_ICON_GRID_WIDTH 155
 
 /* Desktop layout mode defines */
-#define DESKTOP_PAD_HORIZONTAL 	30
+#define DESKTOP_PAD_HORIZONTAL 	0
 #define DESKTOP_PAD_VERTICAL 	10
 #define CELL_SIZE 		20
 
Index: src/file-manager/nautilus-desktop-icon-view-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-desktop-icon-view-ui.xml,v
retrieving revision 1.15
diff -u -p -r1.15 nautilus-desktop-icon-view-ui.xml
--- src/file-manager/nautilus-desktop-icon-view-ui.xml	2 Jul 2002 09:32:25 -0000	1.15
+++ src/file-manager/nautilus-desktop-icon-view-ui.xml	19 Mar 2003 21:22:51 -0000
@@ -68,15 +68,17 @@
         </popup>
 
         <popup name="selection">
-                <placeholder name="Empty Trash Holder" delimit="top">
-                        <menuitem name="Empty Trash" verb="Empty Trash Conditional"/>
-                </placeholder>
-                <placeholder name="Removabel Media Holder" delimit="top">
-                        <menuitem name="Unmount Volume" verb="Unmount Volume Conditional"/>
-                        <menuitem name="Protect Media" verb="Protect Conditional"/>
-                        <menuitem name="Format Media" verb="Format Conditional"/>
-                        <menuitem name="Media Properties" verb="Media Properties Conditional"/>
-                </placeholder>
+		<placeholder name="Mime Actions">
+                	<placeholder name="Empty Trash Holder">
+                        	<menuitem name="Empty Trash" verb="Empty Trash Conditional"/>
+               		</placeholder>
+                	<placeholder name="Removabel Media Holder">
+                    	   	<menuitem name="Unmount Volume" verb="Unmount Volume Conditional"/>
+                    	    	<menuitem name="Protect Media" verb="Protect Conditional"/>
+                    	    	<menuitem name="Format Media" verb="Format Conditional"/>
+                     	   	<menuitem name="Media Properties" verb="Media Properties Conditional"/>
+              		</placeholder>
+		</placeholder>
         </popup>
 </popups>
 </Root>
Index: src/file-manager/nautilus-directory-view-ui.xml
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-directory-view-ui.xml,v
retrieving revision 1.52
diff -u -p -r1.52 nautilus-directory-view-ui.xml
--- src/file-manager/nautilus-directory-view-ui.xml	6 Jan 2003 15:27:57 -0000	1.52
+++ src/file-manager/nautilus-directory-view-ui.xml	19 Mar 2003 21:22:53 -0000
@@ -263,7 +263,7 @@
 		<placeholder name="Icon Appearance Items" delimit="top">
 		</placeholder>
 
-		<placeholder name="Mime Actions" delimit="none"/>
+		<placeholder name="Mime Actions" delimit="top"/>
                 <separator/>
 
                 <menuitem name="Properties"