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

Launch the keystore_server on demand from BKeyStore. 

This allows leaving the keystore_server closed as long as it isn't
used and still avoids having to launch it manually.
This commit is contained in:
Michael Lotz 2013-03-31 20:23:45 +02:00
parent 6de478363e
commit 4e66f871e5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/app/KeyStore.cpp
View File

@ -9,6 +9,7 @@
#include <KeyStoreDefs.h>
#include <Messenger.h>
#include <Roster.h>
using namespace BPrivate;
@ -416,8 +417,17 @@ BKeyStore::_SendKeyMessage(BMessage& message, BMessage* reply) const
reply = &localReply;
BMessenger messenger(kKeyStoreServerSignature);
if (!messenger.IsValid())
return B_ERROR;
if (!messenger.IsValid()) {
// Try to start the keystore server.
status_t result = be_roster->Launch(kKeyStoreServerSignature);
if (result != B_OK && result != B_ALREADY_RUNNING)
return B_ERROR;
// Then re-target the messenger and check again.
messenger.SetTo(kKeyStoreServerSignature);
if (!messenger.IsValid())
return B_ERROR;
}
if (messenger.SendMessage(&message, reply) != B_OK)
return B_ERROR;