Commit 4618c73b authored by Darin Adler's avatar Darin Adler
Browse files

Fixed bug 3079 (Cannot copy or link files or folders with current

	build). This was just an || where there should be a &&.

	Also took another crack at making the tinderbox succeed.

	* libnautilus-extensions/nautilus-icon-dnd.c:
	(selection_includes_trash): Change || to &&. Oops.

	* nautilus.spec.in: Removed unused directories.
	* po/POTFILES.in: Removed unused files.

	* libnautilus-extensions/nautilus-drag.c:
	(nautilus_drag_drop_action_ask): Formatting tweak.
parent 43cdfa38
2000-09-14 Darin Adler <darin@eazel.com>
Fixed bug 3079 (Cannot copy or link files or folders with current
build). This was just an || where there should be a &&.
Also took another crack at making the tinderbox succeed.
* libnautilus-extensions/nautilus-icon-dnd.c:
(selection_includes_trash): Change || to &&. Oops.
* nautilus.spec.in: Removed unused directories.
* po/POTFILES.in: Removed unused files.
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_drop_action_ask): Formatting tweak.
2000-09-14 Andy Hertzfeld <andy@eazel.com>
changed the default click policy from single click to double click as
......
......@@ -438,15 +438,12 @@ nautilus_drag_drop_action_ask (GdkDragAction actions)
case 0:
action = GDK_ACTION_MOVE;
break;
case 1:
action = GDK_ACTION_COPY;
break;
case 2:
action = GDK_ACTION_LINK;
break;
default:
action = 0;
}
......
......@@ -853,7 +853,7 @@ selection_includes_trash (GList *selection_list)
/* FIXME bugzilla.eazel.com 3020: This does sync. I/O and works only locally. */
local_path = gnome_vfs_get_local_path_from_uri (uri);
trash_in_selection = local_path != NULL
|| nautilus_link_local_is_trash_link (local_path);
&& nautilus_link_local_is_trash_link (local_path);
g_free (local_path);
if (trash_in_selection) {
......@@ -889,7 +889,7 @@ nautilus_icon_container_receive_dropped_icons (NautilusIconContainer *container,
action = GDK_ACTION_MOVE;
} else {
action = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK;
}
}
context->action = nautilus_drag_drop_action_ask (action);
}
......
......@@ -438,15 +438,12 @@ nautilus_drag_drop_action_ask (GdkDragAction actions)
case 0:
action = GDK_ACTION_MOVE;
break;
case 1:
action = GDK_ACTION_COPY;
break;
case 2:
action = GDK_ACTION_LINK;
break;
default:
action = 0;
}
......
......@@ -853,7 +853,7 @@ selection_includes_trash (GList *selection_list)
/* FIXME bugzilla.eazel.com 3020: This does sync. I/O and works only locally. */
local_path = gnome_vfs_get_local_path_from_uri (uri);
trash_in_selection = local_path != NULL
|| nautilus_link_local_is_trash_link (local_path);
&& nautilus_link_local_is_trash_link (local_path);
g_free (local_path);
if (trash_in_selection) {
......@@ -889,7 +889,7 @@ nautilus_icon_container_receive_dropped_icons (NautilusIconContainer *container,
action = GDK_ACTION_MOVE;
} else {
action = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK;
}
}
context->action = nautilus_drag_drop_action_ask (action);
}
......
......@@ -26,7 +26,6 @@ Requires: GConf >= 0.5
Requires: ORBit >= 0.5.1
Requires: oaf >= 0.3.0
Requires: gnome-vfs >= 0.1
Requires: gtkhtml >= 0.4
Requires: gdk-pixbuf >= 0.8.0
Requires: bonobo >= 0.15
Requires: eog >= 0.3
......
......@@ -2,8 +2,6 @@ components/help/hyperbola-filefmt.c
components/help/hyperbola-nav-index.c
components/help/hyperbola-types.h
components/history/nautilus-history-view.c
components/html/gnome-dialogs.c
components/html/ntl-web-browser.c
components/loser/content/nautilus-content-loser.c
components/loser/sidebar/nautilus-sidebar-loser.c
components/mozilla/nautilus-mozilla-content-view.c
......@@ -38,7 +36,6 @@ components/services/time/service/trilobite-eazel-time-service.c
components/services/trilobite/libtrilobite/trilobite-core-utils.c
components/services/vault/command-line/main.c
components/shell/shell.c
components/websearch/ntl-web-search.c
libnautilus-extensions/nautilus-druid.c
libnautilus-extensions/nautilus-druid-page-eazel.c
libnautilus-extensions/nautilus-entry.c
......
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