Commit 0df7aba6 authored by Darin Adler's avatar Darin Adler

Do fix based on patch from Martin Wehner <mwehner@tfh-berlin.de> to

	* libnautilus-private/nautilus-file-operations.c:
	(handle_transfer_ok): Do fix based on patch from Martin Wehner
	<mwehner@tfh-berlin.de> to prevent cancel of emptying trash or
	deleting from core dumping.

	* Makefile.am:
	* configure.in:
	* docs/.cvsignore:
	* docs/Makefile.am:
	Add files in the docs directory to tarball.

	* libnautilus/nautilus-view-standard-main.c:
	(nautilus_view_standard_main_multi): Whitespace tweak.
parent d58fa91a
2001-12-09 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-file-operations.c:
(handle_transfer_ok): Do fix based on patch from Martin Wehner
<mwehner@tfh-berlin.de> to prevent cancel of emptying trash or
deleting from core dumping.
* Makefile.am:
* configure.in:
* docs/.cvsignore:
* docs/Makefile.am:
Add files in the docs directory to tarball.
* libnautilus/nautilus-view-standard-main.c:
(nautilus_view_standard_main_multi): Whitespace tweak.
2001-12-08 Anders Carlsson <andersca@gnu.org>
* components/throbber/nautilus-throbber.c:
......
......@@ -18,6 +18,7 @@ SUBDIRS = \
user-guide \
help \
omf-install \
docs \
$(NULL)
XXX = \
......
......@@ -382,6 +382,7 @@ cut-n-paste-code/widgets/gimphwrapbox/Makefile
data/Makefile
data/emblems/Makefile
data/patterns/Makefile
docs/Makefile
help/Makefile
help/nautilus-quick-reference/C/Makefile
help/nautilus-quick-reference/Makefile
......
Makefile
Makefile.in
NULL =
EXTRA_DIST = \
architecture.txt \
dnd.txt \
load-states.dia \
nautilus-io.txt \
nautilus.faq \
recommended-books.html \
smoketests.html \
state-machines.txt \
style-guide.html \
$(NULL)
......@@ -456,7 +456,8 @@ handle_transfer_ok (const GnomeVFSXferProgressInfo *progress_info,
/* If cancelled, delete any partially copied files that are laying
* around and return.
*/
if (progress_info->bytes_total != progress_info->bytes_copied) {
if (progress_info->target_name != NULL
&& progress_info->bytes_total != progress_info->bytes_copied) {
GList *delete_me;
delete_me = g_list_prepend (NULL, progress_info->target_name);
......
......@@ -210,8 +210,8 @@ nautilus_view_standard_main_multi (const char *executable_name,
gnome_vfs_init ();
#if GNOME2_CONVERSION_COMPLETE
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
#endif
bonobo_ui_init (executable_name, version, &argc, argv);
if (post_initialize_callback != NULL) {
......@@ -238,6 +238,7 @@ nautilus_view_standard_main_multi (const char *executable_name,
#ifdef GNOME2_CONVERSION_COMPLETE
g_free (registration_id);
#endif
if (factory != NULL) {
/* Loop until we have no more objects. */
do {
......
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