[haiku-commits] haiku: hrev44513 - src/kits/tracker data/common/boot/post_install

hrev44513 adds 1 changeset to branch 'master'
old head: b0841df4664b09403e430ad04405a9d09b9abde5
new head: 39433058f77bd2c7167c855b6ad695396db57774

----------------------------------------------------------------------------

3943305: Fix ticket #8858.
  
  - 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.

                                      [ Rene Gollent <anevilyak@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44513
Commit:      39433058f77bd2c7167c855b6ad695396db57774
URL:         http://cgit.haiku-os.org/haiku/commit/?id=3943305
Author:      Rene Gollent <anevilyak@xxxxxxxxx>
Date:        Sat Aug 11 13:56:20 2012 UTC

Ticket:      https://dev.haiku-os.org/ticket/8858

----------------------------------------------------------------------------

2 files changed, 9 insertions(+), 6 deletions(-)
data/common/boot/post_install/mime_update.sh |    3 +++
src/kits/tracker/PoseView.cpp                |   12 ++++++------

----------------------------------------------------------------------------

diff --git a/data/common/boot/post_install/mime_update.sh 
b/data/common/boot/post_install/mime_update.sh
index 8917f72..b069c2a 100755
--- a/data/common/boot/post_install/mime_update.sh
+++ b/data/common/boot/post_install/mime_update.sh
@@ -24,6 +24,9 @@ done
 
 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"
 mimeset -apps -f "$SYSTEM/apps"
 _progress 0.2 "documentation"
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 0ec53c7..e98c5c8 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -2656,7 +2656,7 @@ BPoseView::RemoveColumn(BColumn* columnToRemove, bool 
runAlert)
        }
 
        fStateNeedsSaving = true;
-       
+
        if (fFiltering) {
                // the column we removed might just be the one that was used to 
filter
                int32 count = fFilteredPoseList->CountItems();
@@ -5170,14 +5170,14 @@ BPoseView::FSNotification(const BMessage* message)
                                        // and that both some_folder and 
another_folder didn't
                                        // exist yet. We are looking if the 
just created folder
                                        // 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);
                                        if (model->IsDirectory()) {
                                                BString 
createdPath(BPath(model->EntryRef()).Path());
                                                BDirectory 
currentDir(TargetModel()->EntryRef());
                                                BPath 
createdDir(model->EntryRef());
                                                for (int32 i = 0; i < count; 
i++) {
-                                                       BSymLink 
link(fBrokenLinks->ItemAt(i)->EntryRef());     
+                                                       BSymLink 
link(fBrokenLinks->ItemAt(i)->EntryRef());
                                                        BPath path;
                                                        
link.MakeLinkedPath(&currentDir, &path);
                                                        BString 
pathStr(path.Path());
@@ -5502,7 +5502,7 @@ BPoseView::WatchParentOf(const entry_ref* ref)
        BSymLink symlink(ref);
        BPath path;
 
-       symlink.MakeLinkedPath(currentDir.Path(), &path);       
+       symlink.MakeLinkedPath(currentDir.Path(), &path);
        status_t status = path.GetParent(&path);
 
        while (status == B_BAD_VALUE)
@@ -5555,7 +5555,7 @@ BPoseView::StopWatchingParentsOf(const entry_ref* ref)
                        link.MakeLinkedPath(currentDir.Path(), &absolutePath);
                        if (BString(absolutePath.Path()).Compare(path.Path(),
                                        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.
                                brokenLinksCopy->RemoveItemAt(i);
                                count--;
@@ -8365,7 +8365,7 @@ BPoseView::IdentifySelection()
        int32 count = fSelectionList->CountItems();
        for (int32 index = 0; index < count; index++) {
                BPose* pose = fSelectionList->ItemAt(index);
-               BEntry entry(pose->TargetModel()->EntryRef());
+               BEntry entry(pose->TargetModel()->ResolveIfLink()->EntryRef());
                if (entry.InitCheck() == B_OK) {
                        BPath path;
                        if (entry.GetPath(&path) == B_OK)


Other related posts:

  • » [haiku-commits] haiku: hrev44513 - src/kits/tracker data/common/boot/post_install - anevilyak