[haiku-commits] r35134 - haiku/trunk/src/kits/tracker

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 17 Jan 2010 21:07:30 +0100 (CET)

Author: anevilyak
Date: 2010-01-17 21:07:30 +0100 (Sun, 17 Jan 2010)
New Revision: 35134
Changeset: http://dev.haiku-os.org/changeset/35134/haiku

Modified:
   haiku/trunk/src/kits/tracker/InfoWindow.cpp
Log:
Missed a few instances in the previous cleanup.



Modified: haiku/trunk/src/kits/tracker/InfoWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/InfoWindow.cpp 2010-01-17 20:05:01 UTC (rev 
35133)
+++ haiku/trunk/src/kits/tracker/InfoWindow.cpp 2010-01-17 20:07:30 UTC (rev 
35134)
@@ -1254,7 +1254,7 @@
                        offsetPoint.y = point.y - fIconRect.top;
                        if (IconCache::sIconCache->IconHitTest(offsetPoint, 
fIconModel, kNormalIcon, B_LARGE_ICON)) {
                                // Can't drag the trash anywhere..
-                               fTrackingState = FSIsTrashDir(&entry) ? 
open_only_track : icon_track;
+                               fTrackingState = fModel->IsTrash() ? 
open_only_track : icon_track;
 
                                // Check for possible double click
                                if (abs((int32)(fClickPoint.x - point.x)) < 
kDragSlop
@@ -2022,7 +2022,7 @@
 
        parent->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 
'O'));
 
-       if (!FSIsTrashDir(&entry)) {
+       if (!model.IsTrash()) {
                parent->AddItem(new BMenuItem("Edit name", new 
BMessage(kEditItem), 'E'));
                parent->AddSeparatorItem();
                if (fModel->IsVolume()) {
@@ -2037,7 +2037,7 @@
                                item->SetEnabled(false);
                } else
                        parent->AddItem(new BMenuItem("Identify", new 
BMessage(kIdentifyEntry)));
-       } else if (FSIsTrashDir(&entry))
+       } else
                parent->AddItem(new BMenuItem("Empty Trash", new 
BMessage(kEmptyTrash)));
 
        BMenuItem *sizeItem = NULL;


Other related posts:

  • » [haiku-commits] r35134 - haiku/trunk/src/kits/tracker - anevilyak