Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove leftover debug output.

Browse Source 
- Simplified BShelf::SaveLocation(). Resolves CID 431.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38302 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2010-08-21 21:11:39 +00:00
parent 4142bceb25
commit 994e96504c
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/kits/interface/Shelf.cpp
View File

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