rpms/nautilus/devel nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch, NONE, 1.1 nautilus.spec, 1.289, 1.290

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16419

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch 
Log Message:
avoid lingering menu items


nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch:
 nautilus-directory-async.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch ---
>From 88da398b39b2047f3f42e56d3d3a24ba18233e40 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 22 Sep 2009 17:26:06 +0200
Subject: [PATCH] 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.
---
 libnautilus-private/nautilus-directory-async.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 653fd30..ff20ac5 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)
 
 		 )
 		);
-- 
1.6.4.4




Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- nautilus.spec	23 Sep 2009 22:09:10 -0000	1.289
+++ nautilus.spec	24 Sep 2009 14:13:31 -0000	1.290
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -88,6 +88,9 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # Need to file upstream and investigate a real fix
 Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
 
+# from upstream
+Patch19:	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -125,6 +128,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
+%patch19 -p1 -b .mount-do-not-use-activation-uri
 
 %build
 
@@ -260,6 +264,9 @@ fi
 
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Avoid lingering menuitems (#518570)
+
 * Wed Sep 23 2009 Ray Strode <rstrode at redhat.com> 2.28.0-2
 - Fix crossfade