From 3773b4751472f62d68a29116ac9c1508ef7b2a63 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 11 Jul 2011 12:24:52 +0200
Subject: [PATCH] Tracker: Sort volumes like folders

Volumes no longer have a higher sorting priority than folders when "sort
folders first" is enabled.
---
 src/kits/tracker/Model.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index 115381b977..f8b735b57f 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -320,16 +320,14 @@ Model::CompareFolderNamesFirst(const Model *compareModel) const
 	const Model *resolvedCompareModel = compareModel->ResolveIfLink();
 	const Model *resolvedMe = ResolveIfLink();
 
-	if (resolvedMe->IsVolume()) {
-		if (!resolvedCompareModel->IsVolume())
-			return -1;
-	} else if (resolvedCompareModel->IsVolume())
-		return 1;
+	bool meIsDirOrVolume = resolvedMe->IsDirectory() || resolvedMe->IsVolume();
+	bool otherIsDirOrVolume = resolvedCompareModel->IsDirectory()
+		|| resolvedCompareModel->IsVolume();
 
-	if (resolvedMe->IsDirectory()) {
-		if (!resolvedCompareModel->IsDirectory())
+	if (meIsDirOrVolume) {
+		if (!otherIsDirOrVolume)
 			return -1;
-	} else if (resolvedCompareModel->IsDirectory())
+	} else if (otherIsDirOrVolume)
 		return 1;
 
 	return NaturalCompare(Name(), compareModel->Name());