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

Adjust the previous change to use paths instead of entry_refs.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43005 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2011-10-30 17:00:50 +00:00
parent 3e6ff860b4
commit c0ad1c9185
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/StatusView.cpp
+7 -7
View File
@@ -84,7 +84,7 @@ using std::max;
const char* const kInstantiateItemCFunctionName = "instantiate_deskbar_item"; const char* const kInstantiateItemCFunctionName = "instantiate_deskbar_item";
const char* const kInstantiateEntryCFunctionName = "instantiate_deskbar_entry"; const char* const kInstantiateEntryCFunctionName = "instantiate_deskbar_entry";
const char* const kReplicantSettingsFile = "Deskbar_replicants"; const char* const kReplicantSettingsFile = "Deskbar_replicants";
const char* const kReplicantRefField = "replicant"; const char* const kReplicantPathField = "replicant_path";
float sMinimumWindowWidth = kGutter + kMinimumTrayWidth + kDragRegionWidth; float sMinimumWindowWidth = kGutter + kMinimumTrayWidth + kDragRegionWidth;
@@ -413,20 +413,20 @@ TReplicantTray::InitAddOnSupport()
BFile file(path.Path(), B_READ_ONLY); BFile file(path.Path(), B_READ_ONLY);
if (file.InitCheck() == B_OK) { if (file.InitCheck() == B_OK) {
entry_ref ref;
status_t result; status_t result;
BEntry entry; BEntry entry;
int32 id; int32 id;
BString path;
if (fAddOnSettings.Unflatten(&file) == B_OK) { if (fAddOnSettings.Unflatten(&file) == B_OK) {
for (int32 i = 0; fAddOnSettings.FindRef(kReplicantRefField, for (int32 i = 0; fAddOnSettings.FindString(kReplicantPathField,
i, &ref) == B_OK; i++) { i, &path) == B_OK; i++) {
if (entry.SetTo(&ref) == B_OK && entry.Exists()) { if (entry.SetTo(path.String()) == B_OK && entry.Exists()) {
result = LoadAddOn(&entry, &id, false); result = LoadAddOn(&entry, &id, false);
} else } else
result = B_ENTRY_NOT_FOUND; result = B_ENTRY_NOT_FOUND;
if (result != B_OK) { if (result != B_OK) {
fAddOnSettings.RemoveData(kReplicantRefField, i); fAddOnSettings.RemoveData(kReplicantPathField, i);
--i; --i;
} }
} }
@@ -627,7 +627,7 @@ TReplicantTray::LoadAddOn(BEntry* entry, int32* id, bool addToSettings)
if (addToSettings) { if (addToSettings) {
entry_ref ref; entry_ref ref;
if (entry->GetRef(&ref) == B_OK) if (entry->GetRef(&ref) == B_OK)
fAddOnSettings.AddRef(kReplicantRefField, &ref); fAddOnSettings.AddString(kReplicantPathField, path.Path());
} }
return B_OK; return B_OK;