Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now has some error checks in TReplicantTray::AddIcon() - this fixes bug #222.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16675 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-03-09 15:22:37 +00:00
parent b57ef1e651
commit 9c50f36ed7
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/apps/deskbar/StatusView.cpp
View File

@ -1014,7 +1014,7 @@ TReplicantTray::IconCount() const
} }
/** message must contain an archivable view /** Message must contain an archivable view
* in the Archives folder for later rehydration * in the Archives folder for later rehydration
* returns the current boot id * returns the current boot id
*/ */
@ -1025,14 +1025,50 @@ TReplicantTray::AddIcon(BMessage *icon, int32 *id, const entry_ref *addOn)
if (!icon || !id) if (!icon || !id)
return B_ERROR; return B_ERROR;
// find entry_ref
entry_ref ref;
if (addOn) {
// Use it if we got it
ref = *addOn;
} else {
const char *signature;
status_t status = icon->FindString("add_on", &signature);
if (status == B_OK) {
BRoster roster;
status = roster.FindApp(signature, &ref);
}
if (status < B_OK)
return status;
}
BFile file;
status_t status = file.SetTo(&ref, B_READ_ONLY);
if (status < B_OK)
return status;
node_ref nodeRef;
status = file.GetNodeRef(&nodeRef);
if (status < B_OK)
return status;
BEntry entry(&ref, true);
// ToDo: this resolves an eventual link for the item
// being added - this is okay for now, but in multi-user
// environments, one might want to have links that
// carry the be:deskbar_item_status attribute
status = entry.InitCheck();
if (status != B_OK)
return status;
*id = 999; *id = 999;
if (icon->what == B_ARCHIVED_OBJECT) if (icon->what == B_ARCHIVED_OBJECT)
icon->what = 0; icon->what = 0;
// !! check for name collisions? // !! check for name collisions?
status_t err = fShelf->AddReplicant(icon, BPoint(1, 1)); status = fShelf->AddReplicant(icon, BPoint(1, 1));
if (err != B_OK) if (status != B_OK)
return err; return status;
float oldWidth = Bounds().Width(); float oldWidth = Bounds().Width();
float oldHeight = Bounds().Height(); float oldHeight = Bounds().Height();
@ -1046,27 +1082,8 @@ TReplicantTray::AddIcon(BMessage *icon, int32 *id, const entry_ref *addOn)
fShelf->ReplicantAt(count-1, &view, (uint32 *)id, NULL); fShelf->ReplicantAt(count-1, &view, (uint32 *)id, NULL);
// add the item to the add-on list // add the item to the add-on list
entry_ref ref;
if (addOn) {
// Use it if we got it
ref = *addOn;
} else {
const char *appsig;
icon->FindString("add_on", &appsig);
BRoster roster;
roster.FindApp(appsig, &ref);
}
BFile file(&ref, B_READ_ONLY);
node_ref nodeRef;
file.GetNodeRef(&nodeRef);
BEntry entry(&ref, true);
// ToDo: this resolves an eventual link for the item
// being added - this is okay for now, but in multi-user
// environments, one might want to have links that
// carry the be:deskbar_item_status attribute
AddItem(*id, nodeRef, entry, addOn != NULL); AddItem(*id, nodeRef, entry, addOn != NULL);
return B_OK; return B_OK;
} }