diff options
| author | Alexander Larsson <alexl@redhat.com> | 2006-03-07 16:25:19 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2006-03-07 16:25:19 +0000 |
| commit | bc6e05ff0ec3945c1cf7ff9bf211dbc070c913bb (patch) | |
| tree | 4a322556a9c43c5f3a369bf2e587217d5605fe27 | |
| parent | df616b94444e5f080835576496002b5b85991a03 (diff) | |
| download | nautilus-bc6e05ff0ec3945c1cf7ff9bf211dbc070c913bb.tar.gz | |
Don't show error dialog if mount error is "".
2006-03-07 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c: (drive_mounted_callback),
(activation_drive_mounted_callback):
Don't show error dialog if mount error is "".
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 16 |
2 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2006-03-07 Alexander Larsson <alexl@redhat.com> + + * src/file-manager/fm-directory-view.c: (drive_mounted_callback), + (activation_drive_mounted_callback): + Don't show error dialog if mount error is "". + 2006-03-06 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-icon-canvas-item.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 6aac2ba1e..b795a6df8 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -6149,6 +6149,11 @@ drive_mounted_callback (gboolean succeeded, gpointer data) { if (!succeeded) { + if (*error == 0 && + detailed_error != NULL && *detailed_error == 0) { + /* This means the mount command displays its own errors */ + return; + } eel_show_error_dialog_with_details (error, NULL, detailed_error, NULL); } @@ -8175,9 +8180,14 @@ activation_drive_mounted_callback (gboolean succeeded, parameters->mount_success &= succeeded; if (!succeeded && !parameters->cancelled) { - eel_show_error_dialog_with_details (error, NULL, - detailed_error, - NULL); + if (*error == 0 && + detailed_error != NULL && *detailed_error == 0) { + /* This means the mount command displays its own errors */ + } else { + eel_show_error_dialog_with_details (error, NULL, + detailed_error, + NULL); + } } if (--parameters->pending_mounts > 0) { |