From 167898484d70594fedd4cf1f83927a54f80d7229 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Wed, 13 Jan 2010 23:50:53 +0000
Subject: [PATCH] FSIsDeskDir should only consider a path to be the desktop if
 it lives on the boot volume. Fixes non-boot Desktop dirs still showing the
 volumes and such in windows and nav menus.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35065 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/tracker/FSUtils.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index 7815a58ddc..38b16bc558 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -2386,10 +2386,16 @@ bool
 FSIsDeskDir(const BEntry *entry, dev_t device)
 {
 	BVolume volume(device);
+	
 	status_t result = volume.InitCheck();
 	if (result != B_OK)
 		return false;
 
+	BVolume bootvolume;
+	BVolumeRoster roster;
+	if (roster.GetBootVolume(&bootvolume) == B_OK && volume != bootvolume)
+		return false;
+
 	BPath path;
 	result = find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
 	if (result != B_OK)