From 994e96504c85c7dea48b6101b994f5c649df1de6 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Sat, 21 Aug 2010 21:11:39 +0000
Subject: [PATCH] - Remove leftover debug output. - Simplified
 BShelf::SaveLocation(). Resolves CID 431.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38302 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/Shelf.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/kits/interface/Shelf.cpp b/src/kits/interface/Shelf.cpp
index 2f28a5d707..db9541945a 100644
--- a/src/kits/interface/Shelf.cpp
+++ b/src/kits/interface/Shelf.cpp
@@ -444,11 +444,8 @@ ShelfContainerViewFilter::_ObjectDropFilter(BMessage *msg, BHandler **_handler)
 		mouseView = dynamic_cast<BView*>(*_handler);
 
 	if (msg->WasDropped()) {
-		if (!fShelf->fAllowDragging) {
-			printf("Dragging replicants isn't allowed to this shelf.");
-			beep();
+		if (!fShelf->fAllowDragging)
 			return B_SKIP_MESSAGE;
-		}
 	}
 
 	BPoint point;
@@ -934,22 +931,13 @@ BShelf::SetSaveLocation(const entry_ref *ref)
 BDataIO *
 BShelf::SaveLocation(entry_ref *ref) const
 {
-	entry_ref entry;
-
-	if (fStream && ref) {
-		*ref = entry;
-		return fStream;
-	}
-	if (fEntry) {
-		fEntry->GetRef(&entry);
-
+	if (fStream) {
 		if (ref)
-			*ref = entry;
+			*ref = entry_ref();
+		return fStream;
+	} else if (fEntry && ref)
+		fEntry->GetRef(ref);
 
-		return NULL;
-	}
-
-	*ref = entry;
 	return NULL;
 }