diff options
| author | Christian Neumair <chris@gnome-de.org> | 2005-10-20 15:30:43 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2005-10-20 15:30:43 +0000 |
| commit | 15bb6ab8c20375cb5a9b63306efb8d2a5342929f (patch) | |
| tree | bb74d56b8acbb749a8317a6fa21940c490e644c1 | |
| parent | bc5f7f1d268e2e5a2e99232207433c666bab6098 (diff) | |
| download | nautilus-15bb6ab8c20375cb5a9b63306efb8d2a5342929f.tar.gz | |
Don't bail if an authentication request was cancelled.
2005-10-20 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-program-choosing.c:
(nautilus_launch_show_file):
* src/nautilus-window-manage-views.c:
(display_view_selection_failure):
* src/file-manager/fm-directory-view.c:
(activate_callback),
(activate_activation_uri_ready_callback):
Don't bail if an authentication request was cancelled.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-program-choosing.c | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 10 | ||||
| -rw-r--r-- | src/nautilus-window-manage-views.c | 6 |
4 files changed, 27 insertions, 2 deletions
@@ -1,5 +1,16 @@ 2005-10-20 Christian Neumair <chris@gnome-de.org> + * libnautilus-private/nautilus-program-choosing.c: + (nautilus_launch_show_file): + * src/nautilus-window-manage-views.c: + (display_view_selection_failure): + * src/file-manager/fm-directory-view.c: + (activate_callback), + (activate_activation_uri_ready_callback): + Don't bail if an authentication request was cancelled. + +2005-10-20 Christian Neumair <chris@gnome-de.org> + * src/nautilus-sidebar-title.c: (update_more_info): * libnautilus-private/nautilus-file.c: diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index 3b11a4c8a..9da89b8f8 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -628,6 +628,8 @@ void nautilus_launch_show_file (NautilusFile *file, detail_message = g_strdup (_("Please check the spelling and try again.")); break; + case GNOME_VFS_ERROR_CANCELLED: + break; case GNOME_VFS_OK: default: #if NEW_MIME_COMPLETE diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 612572bfe..ad14d8349 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -7265,7 +7265,8 @@ activate_callback (NautilusFile *file, gpointer callback_data) view = FM_DIRECTORY_VIEW (parameters->view); - if (!activate_check_mime_types (view, file, TRUE)) { + if (!activate_check_mime_types (view, file, TRUE) + || nautilus_file_get_file_info_result (file) == GNOME_VFS_ERROR_CANCELLED) { nautilus_file_unref (file); g_free (parameters); @@ -7401,6 +7402,13 @@ activate_activation_uri_ready_callback (NautilusFile *file, gpointer callback_da return; } + if (nautilus_file_get_file_info_result (file) == GNOME_VFS_ERROR_CANCELLED) { + stop_activate (parameters); + nautilus_file_unref (parameters->file); + g_free (parameters); + return; + } + if (!parameters->mounted && nautilus_file_has_drive (file)) { drive = nautilus_file_get_drive (file); if (drive != NULL && diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 148acfe50..a44dfbc9f 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1446,7 +1446,11 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file, detail_message = g_strdup (_("Check that an SMB server is running in the local network.")); break; - + + case GNOME_VFS_ERROR_CANCELLED: + g_free (uri_for_display); + return; + case GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE: default: error_message = g_strdup_printf (_("Nautilus cannot display \"%s\"."), |