Started work on volume black list. Added proc and boot to list. Need to

2000-12-25  Gene Z. Ragan  <gzr@eazel.com>

	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_destroy), (free_volume_black_list),
	(volume_in_black_list), (create_mount_link),
	(startup_create_mount_links), (fm_desktop_icon_view_initialize),
	(volume_mounted_callback):
	Started work on volume black list.  Added proc and boot to
	list.  Need to figure out a way to expose this to the UI
	so it is easy for the user to specify what mounts they
	wnat dispalyed on the desktop.

	* libnautilus-extensions/nautilus-drag.c: (add_one_url_list),
	(add_one_path_list), (nautilus_drag_drag_data_get):
	* libnautilus-extensions/nautilus-icon-dnd.c:
	Work on supporting drags form Nautilus into the attachments
	frame of Netscape mail.

6 files changed, 105 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 0343f6e5e..93da0a33c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2000-12-25  Gene Z. Ragan  <gzr@eazel.com>
+	
+	* src/file-manager/fm-desktop-icon-view.c:
+	(fm_desktop_icon_view_destroy), (free_volume_black_list),
+	(volume_in_black_list), (create_mount_link),
+	(startup_create_mount_links), (fm_desktop_icon_view_initialize),
+	(volume_mounted_callback):
+	Started work on volume black list.  Added proc and boot to
+	list.  Need to figure out a way to expose this to the UI
+	so it is easy for the user to specify what mounts they
+	wnat dispalyed on the desktop.
+
+	* libnautilus-extensions/nautilus-drag.c: (add_one_url_list),
+	(add_one_path_list), (nautilus_drag_drag_data_get):
+	* libnautilus-extensions/nautilus-icon-dnd.c:
+	Work on supporting drags form Nautilus into the attachments
+	frame of Netscape mail.
+	
 2000-12-23  John Harper  <jsh@eazel.com>
 
 	* libnautilus-extensions/nautilus-gdk-extensions.c
diff --git a/libnautilus-extensions/nautilus-drag.c b/libnautilus-extensions/nautilus-drag.c
index 92d0538bf..6fcedb85f 100644
--- a/libnautilus-extensions/nautilus-drag.c
+++ b/libnautilus-extensions/nautilus-drag.c
@@ -355,10 +355,18 @@ add_one_uri_list (const char *uri, int x, int y, int w, int h,
 	g_string_append (result, "\r\n");
 }
 
+/* Encode a "_NETSCAPE_URL_" selection.  */
+static void
+add_one_url_list (const char *url, int x, int y, int w, int h, gpointer data)
+{
+	GString *result = (GString *)data;	
+	g_string_append (result, url);
+	g_string_append (result, "\n");
+}
+
 /* Encode a "text/path" selection.  */
 static void
-add_one_path_list (const char *uri, int x, int y, int w, int h, 
-	gpointer data)
+add_one_path_list (const char *uri, int x, int y, int w, int h, gpointer data)
 {
 	GString *result = (GString *)data;
 	const char *path, *scheme;
@@ -415,6 +423,11 @@ nautilus_drag_drag_data_get (GtkWidget *widget,
 		each_selected_item_iterator (add_one_path_list, container_context, result);
 		break;
 		
+	case NAUTILUS_ICON_DND_URL:
+		result = g_string_new (NULL);
+		each_selected_item_iterator (add_one_url_list, container_context, result);
+		break;
+		
 	default:
 		return FALSE;
 	}
diff --git a/libnautilus-extensions/nautilus-icon-dnd.c b/libnautilus-extensions/nautilus-icon-dnd.c
index ed21f4d6b..4098056b7 100644
--- a/libnautilus-extensions/nautilus-icon-dnd.c
+++ b/libnautilus-extensions/nautilus-icon-dnd.c
@@ -96,7 +96,6 @@ static GtkTargetEntry drag_types [] = {
 	{ NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST },
 	{ NAUTILUS_ICON_DND_URL_TYPE, 0, NAUTILUS_ICON_DND_URL },
 	{ NAUTILUS_ICON_DND_TEXT_TYPE, 0, NAUTILUS_ICON_DND_TEXT }
-
 };
 
 static GtkTargetEntry drop_types [] = {
diff --git a/libnautilus-private/nautilus-drag.c b/libnautilus-private/nautilus-drag.c
index 92d0538bf..6fcedb85f 100644
--- a/libnautilus-private/nautilus-drag.c
+++ b/libnautilus-private/nautilus-drag.c
@@ -355,10 +355,18 @@ add_one_uri_list (const char *uri, int x, int y, int w, int h,
 	g_string_append (result, "\r\n");
 }
 
+/* Encode a "_NETSCAPE_URL_" selection.  */
+static void
+add_one_url_list (const char *url, int x, int y, int w, int h, gpointer data)
+{
+	GString *result = (GString *)data;	
+	g_string_append (result, url);
+	g_string_append (result, "\n");
+}
+
 /* Encode a "text/path" selection.  */
 static void
-add_one_path_list (const char *uri, int x, int y, int w, int h, 
-	gpointer data)
+add_one_path_list (const char *uri, int x, int y, int w, int h, gpointer data)
 {
 	GString *result = (GString *)data;
 	const char *path, *scheme;
@@ -415,6 +423,11 @@ nautilus_drag_drag_data_get (GtkWidget *widget,
 		each_selected_item_iterator (add_one_path_list, container_context, result);
 		break;
 		
+	case NAUTILUS_ICON_DND_URL:
+		result = g_string_new (NULL);
+		each_selected_item_iterator (add_one_url_list, container_context, result);
+		break;
+		
 	default:
 		return FALSE;
 	}
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index ed21f4d6b..4098056b7 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -96,7 +96,6 @@ static GtkTargetEntry drag_types [] = {
 	{ NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST },
 	{ NAUTILUS_ICON_DND_URL_TYPE, 0, NAUTILUS_ICON_DND_URL },
 	{ NAUTILUS_ICON_DND_TEXT_TYPE, 0, NAUTILUS_ICON_DND_TEXT }
-
 };
 
 static GtkTargetEntry drop_types [] = {
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index a8b011773..867860338 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -72,6 +72,7 @@ static const char untranslated_trash_link_name[] = N_("Trash");
 struct FMDesktopIconViewDetails
 {
 	BonoboUIComponent *ui;
+	GList *mount_black_list;
 };
 
 typedef struct {
@@ -112,12 +113,12 @@ static int      desktop_icons_compare_callback                            (Nauti
 									   FMDesktopIconView      *icon_view);
 static void	create_or_rename_trash 					  (void);
 								   
-static gboolean real_supports_auto_layout     	 		  	  (FMIconView  	    *view);
-static void	real_merge_menus 		     	 		  (FMDirectoryView  *view);
-static void	real_update_menus 		     	 		  (FMDirectoryView  *view);
-static gboolean real_supports_zooming 	     	 		  	  (FMDirectoryView  *view);
-static void	update_disks_menu 					  (FMDesktopIconView *view);
-
+static gboolean real_supports_auto_layout     	 		  	  (FMIconView  	    	  *view);
+static void	real_merge_menus 		     	 		  (FMDirectoryView  	  *view);
+static void	real_update_menus 		     	 		  (FMDirectoryView  	  *view);
+static gboolean real_supports_zooming 	     	 		  	  (FMDirectoryView  	  *view);
+static void	update_disks_menu 					  (FMDesktopIconView	  *view);
+static void	free_volume_black_list					  (FMDesktopIconView	  *view);
 
 NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMDesktopIconView,
 				   fm_desktop_icon_view,
@@ -148,8 +149,12 @@ fm_desktop_icon_view_destroy (GtkObject *object)
 		bonobo_ui_component_unset_container (icon_view->details->ui);
 		bonobo_object_unref (BONOBO_OBJECT (icon_view->details->ui));
 	}
+	
+	free_volume_black_list (icon_view);
+	
 	g_free (icon_view->details);
 
+
 	/* Clean up any links that may be left over */
 	remove_old_mount_links ();
 	
@@ -217,11 +222,44 @@ fm_desktop_icon_view_handle_middle_click (NautilusIconContainer *icon_container,
 		    ButtonPressMask, (XEvent *) &x_event);
 }
 
+
 static void
-create_mount_link (const NautilusVolume *volume)
+free_volume_black_list (FMDesktopIconView *icon_view)
 {
-	char *desktop_path, *target_uri, *icon_name, *volume_name;
+	GList *p;
+	for (p = icon_view->details->mount_black_list; p != NULL; p = p->next) {
+		g_free (p->data);
+	}
+	
+	g_list_free (icon_view->details->mount_black_list);
+	icon_view->details->mount_black_list = NULL;
+}
+
 
+static gboolean
+volume_in_black_list (const FMDesktopIconView *icon_view, const NautilusVolume *volume)
+{
+	GList *p;
+		
+	for (p = icon_view->details->mount_black_list; p != NULL; p = p->next) {
+		if (strcmp ((char *)p->data, volume->device_path) == 0) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+
+static void
+create_mount_link (const FMDesktopIconView *icon_view, const NautilusVolume *volume)
+{
+	char *desktop_path, *target_uri, *icon_name, *volume_name;
+	
+	if (volume_in_black_list (icon_view, volume)) {
+		return;
+	}
+	
 	/* Get icon type */
 	if (volume->type == NAUTILUS_VOLUME_CDROM) {
 		icon_name = g_strdup ("i-cdrom.png");
@@ -248,7 +286,9 @@ create_mount_link (const NautilusVolume *volume)
 static gboolean
 startup_create_mount_links (const NautilusVolume *volume, gpointer data)
 {
-	create_mount_link (volume);
+	FMDesktopIconView *desktop_icon_view = (FMDesktopIconView *)data;
+	
+	create_mount_link (desktop_icon_view, volume);
 	return TRUE;
 }
 
@@ -280,6 +320,13 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
 	desktop_icon_view->details = g_new0 (FMDesktopIconViewDetails, 1);	
 
 	nautilus_icon_container_set_is_fixed_size (icon_container, TRUE);
+	
+	/* Set up default mount black list */
+	desktop_icon_view->details->mount_black_list = NULL;
+	desktop_icon_view->details->mount_black_list =
+		g_list_append (desktop_icon_view->details->mount_black_list, g_strdup ("/proc"));
+	desktop_icon_view->details->mount_black_list =
+		g_list_append (desktop_icon_view->details->mount_black_list, g_strdup ("/dev/root"));
 
 	/* Set allocation to be at 0, 0 */
 	allocation = &GTK_WIDGET (icon_container)->allocation;
@@ -436,7 +483,7 @@ volume_mounted_callback (NautilusVolumeMonitor *monitor,
 			 NautilusVolume *volume, 
 			 FMDesktopIconView *icon_view)
 {
-	create_mount_link (volume);
+	create_mount_link (icon_view, volume);
 }
 
 static void