summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-03-30 14:08:13 +0000
committerAlexander Larsson <alexl@src.gnome.org>2009-03-30 14:08:13 +0000
commite75c597dbc9ce70933601d6c6d848626fbee63bc (patch)
tree5e9408faf9275bb5ab96a4c974a85322d4c6b51a
parente6a25b037229c744b9618ad4433dc57588be2c63 (diff)
downloadnautilus-e75c597dbc9ce70933601d6c6d848626fbee63bc.tar.gz
Don't show error about not mounted when loading a directory, as this will
2009-03-30 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-error-reporting.c: (fm_report_error_loading_directory): Don't show error about not mounted when loading a directory, as this will anyway automaticall trigger a mount operation (and possible error from that). svn path=/trunk/; revision=15154
-rw-r--r--ChangeLog8
-rw-r--r--src/file-manager/fm-error-reporting.c6
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 17313d7ec..58382e23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-30 Alexander Larsson <alexl@redhat.com>
+
+ * src/file-manager/fm-error-reporting.c:
+ (fm_report_error_loading_directory):
+ Don't show error about not mounted when loading a directory, as
+ this will anyway automaticall trigger a mount operation (and possible
+ error from that).
+
2009-03-26 Alexander Larsson <alexl@redhat.com>
Bug 576761 – fallback icon when icon specified in .desktop doesn't exist is ugly
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index ace6e503a..56f85a67c 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -51,6 +51,12 @@ fm_report_error_loading_directory (NautilusFile *file,
return;
}
+ if (error->domain == G_IO_ERROR &&
+ error->code == G_IO_ERROR_NOT_MOUNTED) {
+ /* This case is retried automatically */
+ return;
+ }
+
file_name = nautilus_file_get_display_name (file);
if (error->domain == G_IO_ERROR) {