diff options
| author | Mike Engber <engber@src.gnome.org> | 2000-10-25 22:13:55 +0000 |
|---|---|---|
| committer | Mike Engber <engber@src.gnome.org> | 2000-10-25 22:13:55 +0000 |
| commit | 391dfdf4ad7e82a052fc41b51d845121622cbaa9 (patch) | |
| tree | ab97f31dd5bc36d08c39bb6992e7e5f5d161e9fb | |
| parent | 37aacc2ec09062b437d3c8e5110cb9944f5e4f39 (diff) | |
| download | nautilus-391dfdf4ad7e82a052fc41b51d845121622cbaa9.tar.gz | |
new_folder_xfer_callback was not escaping the space in duplicate_name,
* libnautilus-extensions/nautilus-file-operations.c:
(new_folder_xfer_callback):
new_folder_xfer_callback was not escaping the space in
duplicate_name, this was causing us to not recognize
second and subsequent new folders (& select them).
* src/file-manager/fm-directory-view.c: (copy_move_done_callback):
moved free call to better spot
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-file-operations.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 2 |
4 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2000-10-25 Michael Engber <engber@eazel.com> + + * libnautilus-extensions/nautilus-file-operations.c: + (new_folder_xfer_callback): + new_folder_xfer_callback was not escaping the space in + duplicate_name, this was causing us to not recognize + second and subsequent new folders (& select them). + * src/file-manager/fm-directory-view.c: (copy_move_done_callback): + moved free call to better spot + 2000-10-25 J Shane Culpepper <pepper@eazel.com> * src/nautilus-window-service-ui.c: (goto_online_storage): diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c index 5d5bebf03..3bb438eaf 100644 --- a/libnautilus-extensions/nautilus-file-operations.c +++ b/libnautilus-extensions/nautilus-file-operations.c @@ -1319,7 +1319,7 @@ new_folder_xfer_callback (GnomeVFSAsyncHandle *handle, progress_info->duplicate_name, progress_info->duplicate_count); } else { - progress_info->duplicate_name = g_strdup_printf ("%s %d", + progress_info->duplicate_name = g_strdup_printf ("%s%%20%d", progress_info->duplicate_name, progress_info->duplicate_count); } diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 5d5bebf03..3bb438eaf 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -1319,7 +1319,7 @@ new_folder_xfer_callback (GnomeVFSAsyncHandle *handle, progress_info->duplicate_name, progress_info->duplicate_count); } else { - progress_info->duplicate_name = g_strdup_printf ("%s %d", + progress_info->duplicate_name = g_strdup_printf ("%s%%20%d", progress_info->duplicate_name, progress_info->duplicate_count); } diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index caeb5d6f4..4617c348d 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1624,8 +1624,8 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data) if (debuting_uri_data->added_files != NULL) { fm_directory_view_set_selection (directory_view, debuting_uri_data->added_files); fm_directory_view_reveal_selection (directory_view); - debuting_uri_data_free (debuting_uri_data); } + debuting_uri_data_free (debuting_uri_data); } else { /* We need to run after the default handler adds the folder we want to * operate on. The ADD_FILE signal is registered as GTK_RUN_LAST, so we |