Added code to handle special desktop layout modes.

2000-08-11  Gene Z. Ragan  <gzr@eazel.com>

	* libnautilus-extensions/nautilus-icon-container.c:
	(icon_set_position), (lay_down_icons),
	(nautilus_icon_container_add):
	Added code to handle special desktop layout modes.

	* libnautilus-extensions/nautilus-icon-container.h:
	* libnautilus-extensions/nautilus-volume-monitor.c:
	(nautilus_volume_monitor_destroy):
	Removed a double cleanup of a timewr callback.

	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_initialize):
	Set a default layout mode.  This is not the same
	as auto layout.

3 files changed, 17 insertions, 8 deletions

diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 11a6d90a7..dea03d4e3 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -175,7 +175,7 @@ icon_set_position (NautilusIcon *icon,
 	container = NAUTILUS_ICON_CONTAINER (GNOME_CANVAS_ITEM (icon->item)->canvas);
 
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
-		/* Clip the movement of the icon within our desktop bounds */
+		/* Clip the position of the icon within our desktop bounds */
 		left = GTK_WIDGET (container)->allocation.x;
 		top  = GTK_WIDGET (container)->allocation.y;
 		right  = left + GTK_WIDGET (container)->allocation.width;
@@ -667,6 +667,14 @@ lay_down_icons (NautilusIconContainer *container, GList *icons, double start_y)
 			lay_down_icons_horizontal (container, icons, start_y);
 			break;
 
+		case NAUTILUS_ICON_CONTAINER_DESKTOP_T_B_L_R:
+			lay_down_icons_horizontal (container, icons, start_y);
+			break;
+			
+		case NAUTILUS_ICON_CONTAINER_DESKTOP_T_B_R_L:
+			lay_down_icons_horizontal (container, icons, start_y);
+			break;
+			
 		default:
 			break;
 	}
@@ -3053,7 +3061,7 @@ nautilus_icon_container_add (NautilusIconContainer *container,
 	NautilusIconContainerDetails *details;
 	GList *p;
 	NautilusIcon *icon;
-
+	
 	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
 	g_return_val_if_fail (data != NULL, FALSE);
 
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index bb2336910..44d77af0b 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -52,7 +52,9 @@ typedef struct {
 } NautilusIconPosition;
 
 typedef enum {
-	NAUTILUS_ICON_CONTAINER_LAYOUT_HORIZONTAL
+	NAUTILUS_ICON_CONTAINER_LAYOUT_HORIZONTAL,
+	NAUTILUS_ICON_CONTAINER_DESKTOP_T_B_L_R,
+	NAUTILUS_ICON_CONTAINER_DESKTOP_T_B_R_L
 } NautilusIconContainerLayoutMode;
 
 typedef struct NautilusIconContainerDetails NautilusIconContainerDetails;
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index ae19fd833..59a33d68c 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -145,15 +145,14 @@ nautilus_volume_monitor_destroy (GtkObject *object)
 		
 	/* Clean up other device info */
 	g_list_foreach (monitor->details->devices, (GFunc)free_device_info, monitor);
-
-	/* Remove timer function */
-	gtk_timeout_remove (monitor->details->mount_device_timer_id);
-	
+		
 	/* Clean up details */	 
 	g_hash_table_destroy (monitor->details->devices_by_fsname);
-	g_list_free (monitor->details->devices);
+	g_list_free (monitor->details->devices);	
 	g_free (monitor->details);
 
+	global_volume_monitor = NULL;
+
 	NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
 }