Was broken when the mounting feature is disabled. This fixes bug #132.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16436 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -49,15 +49,16 @@ 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)
|
||||||
{
|
{
|
||||||
SetFont(be_plain_font);
|
SetFont(be_plain_font);
|
||||||
}
|
}
|
||||||
@@ -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, ¶ms);
|
autoMounter->EachPartition(&AddOnePartitionAsMenuItem, ¶ms);
|
||||||
|
|
||||||
#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
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user