i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ticket #8858.

Browse Source 
- When an Identify/Force Identify request is made in Tracker, if the target
  is a link, resolve it to its destination first. Fixes #8858.
- Have mime_update.sh explicitly mimeset the welcome/user guide scripts.
This commit is contained in:
Rene Gollent
2012-08-11 09:56:20 -04:00
parent b0841df466
commit 39433058f7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/common/boot/post_install/mime_update.sh
+3
View File
@@ -24,6 +24,9 @@ done
SYSTEM=$(/bin/finddir B_SYSTEM_DIRECTORY 2>/dev/null || echo "/boot/system") SYSTEM=$(/bin/finddir B_SYSTEM_DIRECTORY 2>/dev/null || echo "/boot/system")
mimeset -f "$SYSTEM/bin/userguide"
mimeset -f "$SYSTEM/bin/welcome"
_progress 0.1 "system applications" _progress 0.1 "system applications"
mimeset -apps -f "$SYSTEM/apps" mimeset -apps -f "$SYSTEM/apps"
_progress 0.2 "documentation" _progress 0.2 "documentation"
src/kits/tracker/PoseView.cpp
+6 -6
View File
@@ -2656,7 +2656,7 @@ BPoseView::RemoveColumn(BColumn* columnToRemove, bool runAlert)
} }
fStateNeedsSaving = true; fStateNeedsSaving = true;
if (fFiltering) { if (fFiltering) {
// the column we removed might just be the one that was used to filter // the column we removed might just be the one that was used to filter
int32 count = fFilteredPoseList->CountItems(); int32 count = fFilteredPoseList->CountItems();
@@ -5170,14 +5170,14 @@ BPoseView::FSNotification(const BMessage* message)
// and that both some_folder and another_folder didn't // and that both some_folder and another_folder didn't
// exist yet. We are looking if the just created folder // exist yet. We are looking if the just created folder
// is 'some_folder' and watch it, expecting the creation of // is 'some_folder' and watch it, expecting the creation of
// 'another_folder' later and then report the link as fixed. // 'another_folder' later and then report the link as fixed.
Model* model = new Model(&dirNode, &itemNode, name); Model* model = new Model(&dirNode, &itemNode, name);
if (model->IsDirectory()) { if (model->IsDirectory()) {
BString createdPath(BPath(model->EntryRef()).Path()); BString createdPath(BPath(model->EntryRef()).Path());
BDirectory currentDir(TargetModel()->EntryRef()); BDirectory currentDir(TargetModel()->EntryRef());
BPath createdDir(model->EntryRef()); BPath createdDir(model->EntryRef());
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
BSymLink link(fBrokenLinks->ItemAt(i)->EntryRef()); BSymLink link(fBrokenLinks->ItemAt(i)->EntryRef());
BPath path; BPath path;
link.MakeLinkedPath(&currentDir, &path); link.MakeLinkedPath(&currentDir, &path);
BString pathStr(path.Path()); BString pathStr(path.Path());
@@ -5502,7 +5502,7 @@ BPoseView::WatchParentOf(const entry_ref* ref)
BSymLink symlink(ref); BSymLink symlink(ref);
BPath path; BPath path;
symlink.MakeLinkedPath(currentDir.Path(), &path); symlink.MakeLinkedPath(currentDir.Path(), &path);
status_t status = path.GetParent(&path); status_t status = path.GetParent(&path);
while (status == B_BAD_VALUE) while (status == B_BAD_VALUE)
@@ -5555,7 +5555,7 @@ BPoseView::StopWatchingParentsOf(const entry_ref* ref)
link.MakeLinkedPath(currentDir.Path(), &absolutePath); link.MakeLinkedPath(currentDir.Path(), &absolutePath);
if (BString(absolutePath.Path()).Compare(path.Path(), if (BString(absolutePath.Path()).Compare(path.Path(),
strlen(path.Path())) == 0) { strlen(path.Path())) == 0) {
// a broken link still needs to watch this folder, but // a broken link still needs to watch this folder, but
// don't let that same link also watch a deeper parent. // don't let that same link also watch a deeper parent.
brokenLinksCopy->RemoveItemAt(i); brokenLinksCopy->RemoveItemAt(i);
count--; count--;
@@ -8365,7 +8365,7 @@ BPoseView::IdentifySelection()
int32 count = fSelectionList->CountItems(); int32 count = fSelectionList->CountItems();
for (int32 index = 0; index < count; index++) { for (int32 index = 0; index < count; index++) {
BPose* pose = fSelectionList->ItemAt(index); BPose* pose = fSelectionList->ItemAt(index);
BEntry entry(pose->TargetModel()->EntryRef()); BEntry entry(pose->TargetModel()->ResolveIfLink()->EntryRef());
if (entry.InitCheck() == B_OK) { if (entry.InitCheck() == B_OK) {
BPath path; BPath path;
if (entry.GetPath(&path) == B_OK) if (entry.GetPath(&path) == B_OK)