From 969a5d2fac18758844b4653622181d4863ea6817 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sat, 20 Jun 2015 19:39:54 -0700 Subject: [PATCH] Fix mess in Tracker add-ons created in hrev48858 Revert the Tracker portions of hrev48858, they were not needed and were not right either... sorry guys OpenTargetFolder add-on modified slightly to use the passed in symlink(s) only, the parent directory ref is unused, it appears to be unneeded here also. With this and the reverted commits Zip-O-Matic and other add-ons should work again. Fixes #12105 --- src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp | 2 +- src/kits/tracker/ContainerWindow.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp b/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp index 47109f4701..67935927d8 100644 --- a/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp +++ b/src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp @@ -50,7 +50,7 @@ process_refs(entry_ref directoryRef, BMessage* message, void*) break; } - BEntry targetEntry(&directoryRef, true); + BEntry targetEntry(&ref, true); if (targetEntry.InitCheck() != B_OK) { BAlert* alert = new BAlert("Open Target Folder", "Cannot open target entry. Maybe this link is broken?", diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index 4f5d5a438e..e09c09ef87 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -3223,13 +3223,8 @@ BContainerWindow::LoadAddOn(BMessage* message) refs->AddMessenger("TrackerViewToken", BMessenger(PoseView())); - const entry_ref* modelRef = TargetModel()->IsContainer() - && selectionList->ItemAt(0) != NULL - ? selectionList->ItemAt(0)->TargetModel()->EntryRef() - : TargetModel()->EntryRef(); - LaunchInNewThread("Add-on", B_NORMAL_PRIORITY, &AddOnThread, refs, - addonRef, *modelRef); + addonRef, *TargetModel()->EntryRef()); }