summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@redhat.com>2009-09-24 09:44:17 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-09-24 09:44:17 -0400
commit541c225fea1d616d01862d0f6b0ff9086317540a (patch)
treee5cbc2cc27591c68c078dc68cfb93c23104e253e
parente15707648d6d92abe455107718a1e0a440c7fe1f (diff)
downloadnautilus-541c225fea1d616d01862d0f6b0ff9086317540a.tar.gz
Don't rely on activation_uri when detecting mounts
We test for the activation_uri (i.e. G_FILE_ATTRIBUTE_STANDARD_TARGET_URI) which is usually not exposed from computer:// items until the item is mounted (and that's up to particular gvfs volume monitor). Simply don't test for activation_uri, file type of G_FILE_TYPE_MOUNTABLE should be enough. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=518570
-rw-r--r--libnautilus-private/nautilus-directory-async.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 653fd30da..ff20ac55e 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -1700,9 +1700,8 @@ lacks_mount (NautilusFile *file)
(file->details->type == G_FILE_TYPE_DIRECTORY &&
nautilus_file_is_self_owned (file)) ||
- /* Mountable with a target_uri, could be a mountpoint */
- (file->details->type == G_FILE_TYPE_MOUNTABLE &&
- file->details->activation_uri != NULL)
+ /* Mountable, could be a mountpoint */
+ (file->details->type == G_FILE_TYPE_MOUNTABLE)
)
);