diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-01-26 00:35:20 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-01-26 00:35:20 +0000 |
| commit | 95547ea5cf0220ea41da4dcd30e155e08acf78f6 (patch) | |
| tree | c913dfb766fbe26a17f5f4d3dbe74ed5ce32af7f | |
| parent | 0dee20f4c766462157fc9628708d83c785f9101f (diff) | |
| download | nautilus-95547ea5cf0220ea41da4dcd30e155e08acf78f6.tar.gz | |
Use nautilus_get_uri_shortname_for_display to avoid crashing g_markup with
2006-01-26 Martin Wehner <martin.wehner@gmail.com>
* libnautilus-private/nautilus-file-operations.c:
(progress_dialog_set_to_from_item_text):
Use nautilus_get_uri_shortname_for_display to avoid
crashing g_markup with invalid utf-8. Fixes #325586.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2006-01-26 Martin Wehner <martin.wehner@gmail.com> + + * libnautilus-private/nautilus-file-operations.c: + (progress_dialog_set_to_from_item_text): + Use nautilus_get_uri_shortname_for_display to avoid + crashing g_markup with invalid utf-8. Fixes #325586. + 2005-12-10 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-directory-view.c: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index f0c56da7e..27a45201a 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -57,6 +57,7 @@ #include "nautilus-global-preferences.h" #include "nautilus-link.h" #include "nautilus-trash-monitor.h" +#include "nautilus-file-utilities.h" typedef enum { TRANSFER_MOVE, @@ -348,7 +349,7 @@ progress_dialog_set_to_from_item_text (NautilusFileOperationsProgress *dialog, if (from_uri != NULL) { uri = gnome_vfs_uri_new (from_uri); - item = gnome_vfs_uri_extract_short_name (uri); + item = nautilus_get_uri_shortname_for_display (uri); from_path = gnome_vfs_uri_extract_dirname (uri); /* remove the last '/' */ |