Commit fbd62e61 authored by Gene Z. Ragan's avatar Gene Z. Ragan Committed by Gene Ragan
Browse files

Fixed bug 6453, Gnome VFS_CRITICAL received when dragging nautilus link

2001-02-09  Gene Z. Ragan  <gzr@eazel.com>

	Fixed bug 6453, Gnome VFS_CRITICAL received when dragging
	nautilus link icons over each other.

	* libnautilus-extensions/nautilus-drag.c:
	(nautilus_drag_default_drop_action_for_icons):

	* libnautilus-extensions/nautilus-icon-dnd.c:
	(nautilus_icon_container_dropped_icon_feedback),
	(nautilus_icon_dnd_end_drag):
parent ab11ebf1
2001-02-09 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 6453, Gnome VFS_CRITICAL received when dragging
nautilus link icons over each other.
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_default_drop_action_for_icons):
* libnautilus-extensions/nautilus-icon-dnd.c:
(nautilus_icon_container_dropped_icon_feedback),
(nautilus_icon_dnd_end_drag):
2001-02-08 Robey Pointer <robey@eazel.com>
* components/mozilla/nautilus-mozilla-content-view.c:
......
......@@ -322,6 +322,12 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
target_uri = gnome_vfs_uri_new (target_uri_string);
}
if (target_uri == NULL) {
*default_action = 0;
*non_default_action = 0;
return;
}
/* Compare the first dropped uri with the target uri for same fs match. */
dropped_uri = gnome_vfs_uri_new (((DragSelectionItem *)items->data)->uri);
same_fs = TRUE;
......
......@@ -345,7 +345,7 @@ nautilus_icon_container_dropped_icon_feedback (GtkWidget *widget,
container = NAUTILUS_ICON_CONTAINER (widget);
dnd_info = container->details->dnd_info;
/* Delete old selection list. */
nautilus_drag_destroy_selection_list (dnd_info->drag_info.selection_list);
dnd_info->drag_info.selection_list = NULL;
......@@ -1344,7 +1344,7 @@ nautilus_icon_dnd_end_drag (NautilusIconContainer *container)
NautilusIconDndInfo *dnd_info;
g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
dnd_info = container->details->dnd_info;
g_return_if_fail (dnd_info != NULL);
stop_auto_scroll (container);
......
......@@ -322,6 +322,12 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
target_uri = gnome_vfs_uri_new (target_uri_string);
}
if (target_uri == NULL) {
*default_action = 0;
*non_default_action = 0;
return;
}
/* Compare the first dropped uri with the target uri for same fs match. */
dropped_uri = gnome_vfs_uri_new (((DragSelectionItem *)items->data)->uri);
same_fs = TRUE;
......
......@@ -345,7 +345,7 @@ nautilus_icon_container_dropped_icon_feedback (GtkWidget *widget,
container = NAUTILUS_ICON_CONTAINER (widget);
dnd_info = container->details->dnd_info;
/* Delete old selection list. */
nautilus_drag_destroy_selection_list (dnd_info->drag_info.selection_list);
dnd_info->drag_info.selection_list = NULL;
......@@ -1344,7 +1344,7 @@ nautilus_icon_dnd_end_drag (NautilusIconContainer *container)
NautilusIconDndInfo *dnd_info;
g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
dnd_info = container->details->dnd_info;
g_return_if_fail (dnd_info != NULL);
stop_auto_scroll (container);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment