From 37335989120ad8f18a9d3d2e4c8489410c0fc4e5 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 26 Apr 2015 14:01:05 -0400 Subject: [PATCH] Tracker: delete more non-Haiku code. --- src/kits/tracker/PoseView.cpp | 16 ++-------------- src/kits/tracker/TrashWatcher.cpp | 2 -- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp index db5b039c9f..e60e882029 100644 --- a/src/kits/tracker/PoseView.cpp +++ b/src/kits/tracker/PoseView.cpp @@ -10076,20 +10076,8 @@ BPoseView::IsWatchingDateFormatChange() void BPoseView::StartWatchDateFormatChange() { -// TODO: Workaround for R5 (overful message queue)! -// Unfortunately, this causes a dead-lock under certain circumstances. -#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_DANO) - if (IsFilePanel()) { -#endif - BMessenger trackerMessenger(kTrackerSignature); - BHandler::StartWatching(trackerMessenger, kDateFormatChanged); -#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_DANO) - } else if (be_app->LockLooper()) { - be_app->StartWatching(this, kDateFormatChanged); - be_app->UnlockLooper(); - } -#endif - + BMessenger trackerMessenger(kTrackerSignature); + BHandler::StartWatching(trackerMessenger, kDateFormatChanged); fIsWatchingDateFormatChange = true; } diff --git a/src/kits/tracker/TrashWatcher.cpp b/src/kits/tracker/TrashWatcher.cpp index fa9d4e24e2..c5059a37f2 100644 --- a/src/kits/tracker/TrashWatcher.cpp +++ b/src/kits/tracker/TrashWatcher.cpp @@ -173,7 +173,6 @@ BTrashWatcher::UpdateTrashIcons() = GetTrackerResources()->LoadResource('MICN', fTrashFull ? R_TrashFullIcon : R_TrashIcon, &smallSize); -#ifdef HAIKU_TARGET_PLATFORM_HAIKU size_t vectorSize = 0; const void* vectorData = GetTrackerResources()->LoadResource( B_VECTOR_ICON_TYPE, @@ -184,7 +183,6 @@ BTrashWatcher::UpdateTrashIcons() vectorData, vectorSize); } else TRESPASS(); -#endif if (largeData) { trashDir.WriteAttr(kAttrLargeIcon, 'ICON', 0,