diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-12-09 20:45:12 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-12-09 20:45:12 +0000 |
| commit | 0df7aba68df19dd7b5b09ca3022538f92da56644 (patch) | |
| tree | 0efca6cfcd2ac328009e9b0755e92ce498d6127f | |
| parent | d58fa91abdd3229e6e867189010b19e15eb4e9e0 (diff) | |
| download | nautilus-0df7aba68df19dd7b5b09ca3022538f92da56644.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | docs/.cvsignore | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 13 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 3 | ||||
| -rw-r--r-- | libnautilus/nautilus-view-standard-main.c | 3 |
7 files changed, 37 insertions, 2 deletions
@@ -1,3 +1,19 @@ +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: diff --git a/Makefile.am b/Makefile.am index e9f4aadb2..61eba6e52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ SUBDIRS = \ user-guide \ help \ omf-install \ + docs \ $(NULL) XXX = \ diff --git a/configure.in b/configure.in index 22ea40d69..6dc0cea27 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/docs/.cvsignore b/docs/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/docs/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 000000000..cfbb431f4 --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,13 @@ +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) diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 505b653f5..bed587402 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -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); diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index 6cfe50b4e..5770ad4ad 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -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 { |