- 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
This commit is contained in:
parent
4142bceb25
commit
994e96504c
@ -444,12 +444,9 @@ 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;
|
||||
BPoint offset;
|
||||
@ -934,25 +931,16 @@ 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;
|
||||
}
|
||||
|
||||
|
||||
status_t
|
||||
BShelf::AddReplicant(BMessage *data, BPoint location)
|
||||
|
Loading…
Reference in New Issue
Block a user