|
 |
d6d0ab4 |
From 88da398b39b2047f3f42e56d3d3a24ba18233e40 Mon Sep 17 00:00:00 2001
|
|
|
d6d0ab4 |
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
|
d6d0ab4 |
Date: Tue, 22 Sep 2009 17:26:06 +0200
|
|
|
d6d0ab4 |
Subject: [PATCH] Don't rely on activation_uri when detecting mounts
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
We test for the activation_uri (i.e. G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)
|
|
|
d6d0ab4 |
which is usually not exposed from computer:// items until the item is mounted
|
|
|
d6d0ab4 |
(and that's up to particular gvfs volume monitor).
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
Simply don't test for activation_uri, file type of G_FILE_TYPE_MOUNTABLE
|
|
|
d6d0ab4 |
should be enough.
|
|
|
d6d0ab4 |
---
|
|
|
d6d0ab4 |
libnautilus-private/nautilus-directory-async.c | 5 ++---
|
|
|
d6d0ab4 |
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
|
|
|
d6d0ab4 |
index 653fd30..ff20ac5 100644
|
|
|
d6d0ab4 |
--- a/libnautilus-private/nautilus-directory-async.c
|
|
|
d6d0ab4 |
+++ b/libnautilus-private/nautilus-directory-async.c
|
|
|
d6d0ab4 |
@@ -1700,9 +1700,8 @@ lacks_mount (NautilusFile *file)
|
|
|
d6d0ab4 |
(file->details->type == G_FILE_TYPE_DIRECTORY &&
|
|
|
d6d0ab4 |
nautilus_file_is_self_owned (file)) ||
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
- /* Mountable with a target_uri, could be a mountpoint */
|
|
|
d6d0ab4 |
- (file->details->type == G_FILE_TYPE_MOUNTABLE &&
|
|
|
d6d0ab4 |
- file->details->activation_uri != NULL)
|
|
|
d6d0ab4 |
+ /* Mountable, could be a mountpoint */
|
|
|
d6d0ab4 |
+ (file->details->type == G_FILE_TYPE_MOUNTABLE)
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
)
|
|
|
d6d0ab4 |
);
|
|
|
d6d0ab4 |
--
|
|
|
d6d0ab4 |
1.6.4.4
|
|
|
d6d0ab4 |
|
|
|
d6d0ab4 |
|