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

Was broken when the mounting feature is disabled. This fixes bug #132.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16436 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-02-16 20:27:11 +00:00
parent e635421dad
commit 77187226cd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/MountMenu.cpp
+6 -8
View File
@@ -49,13 +49,14 @@ All rights reserved.
#include "Bitmaps.h" #include "Bitmaps.h"
#if OPEN_TRACKER #if OPEN_TRACKER
#include "DeviceMap.h" # include "DeviceMap.h"
#else #else
#include <private/storage/DeviceMap.h> # include <private/storage/DeviceMap.h>
#endif #endif
#define SHOW_NETWORK_VOLUMES #define SHOW_NETWORK_VOLUMES
MountMenu::MountMenu(const char *name) MountMenu::MountMenu(const char *name)
: BMenu(name) : BMenu(name)
{ {
@@ -126,7 +127,7 @@ AddOnePartitionAsMenuItem(Partition *partition, void *castToParams)
return NULL; return NULL;
} }
#endif #endif // _INCLUDES_CLASS_DEVICE_MAP
bool bool
@@ -150,7 +151,6 @@ MountMenu::AddDynamicItem(add_state)
autoMounter->EachPartition(&AddOnePartitionAsMenuItem, &params); autoMounter->EachPartition(&AddOnePartitionAsMenuItem, &params);
#ifdef SHOW_NETWORK_VOLUMES #ifdef SHOW_NETWORK_VOLUMES
// iterate the volume roster and look for volumes with the // iterate the volume roster and look for volumes with the
// 'shared' attributes -- these same volumes will not be returned // 'shared' attributes -- these same volumes will not be returned
// by the autoMounter because they do not show up in the /dev tree // by the autoMounter because they do not show up in the /dev tree
@@ -181,7 +181,7 @@ MountMenu::AddDynamicItem(add_state)
AddItem(item); AddItem(item);
} }
} }
#endif #endif // SHOW_NETWORK_VOLUMES
AddSeparatorItem(); AddSeparatorItem();
@@ -202,9 +202,7 @@ MountMenu::AddDynamicItem(add_state)
if (rescanItem) if (rescanItem)
rescanItem->SetTarget(autoMounter); rescanItem->SetTarget(autoMounter);
#endif // _INCLUDES_CLASS_DEVICE_MAP
return false; return false;
#else
return true;
#endif
} }