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

Only write the icons if we did in fact have to freshly create the Trash directory. Should fix #5827 completely. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36522 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2010-04-28 20:17:30 +00:00
parent 0872569da9
commit ca34b4221c
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/kits/tracker/FSUtils.cpp
View File

@ -2362,7 +2362,13 @@ FSGetTrashDir(BDirectory *trashDir, dev_t dev)
return result;
BPath path;
result = find_directory(B_TRASH_DIRECTORY, &path, true, &volume);
bool created = false;
result = find_directory(B_TRASH_DIRECTORY, &path, false, &volume);
if (result != B_OK) {
result = find_directory(B_TRASH_DIRECTORY, &path, true,
&volume);
created = true;
}
if (result != B_OK)
return result;
@ -2370,38 +2376,40 @@ FSGetTrashDir(BDirectory *trashDir, dev_t dev)
if (result != B_OK)
return result;
// make trash invisible
StatStruct sbuf;
trashDir->GetStat(&sbuf);
if (created)
{
// make trash invisible
StatStruct sbuf;
trashDir->GetStat(&sbuf);
PoseInfo poseInfo;
poseInfo.fInvisible = true;
poseInfo.fInitedDirectory = sbuf.st_ino;
trashDir->WriteAttr(kAttrPoseInfo, B_RAW_TYPE, 0, &poseInfo,
sizeof(PoseInfo));
PoseInfo poseInfo;
poseInfo.fInvisible = true;
poseInfo.fInitedDirectory = sbuf.st_ino;
trashDir->WriteAttr(kAttrPoseInfo, B_RAW_TYPE, 0, &poseInfo,
sizeof(PoseInfo));
size_t size;
const void* data = GetTrackerResources()->
LoadResource('ICON', R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrLargeIcon, 'ICON', 0,
data, size);
}
data = GetTrackerResources()->
LoadResource('MICN', R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrMiniIcon, 'MICN', 0,
data, size);
}
// TODO: figure out why writing the vector icon seems broken.
#if 0
data = GetTrackerResources()->
LoadResource(B_VECTOR_ICON_TYPE, R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrIcon, B_VECTOR_ICON_TYPE, 0,
data, size);
}
size_t size;
const void* data = GetTrackerResources()->
LoadResource('ICON', R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrLargeIcon, 'ICON', 0,
data, size);
}
data = GetTrackerResources()->
LoadResource('MICN', R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrMiniIcon, 'MICN', 0,
data, size);
}
#ifdef __HAIKU__
data = GetTrackerResources()->
LoadResource(B_VECTOR_ICON_TYPE, R_TrashIcon, &size);
if (data != NULL) {
trashDir->WriteAttr(kAttrIcon, B_VECTOR_ICON_TYPE, 0,
data, size);
}
#endif
}
return B_OK;
}