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

BRoster: Added ability to pass env on launch.

Browse Source 
* Added BRoster::Private::Launch() that adds an additional parameter
  to pass a pointer to the environment of the launched app.
This commit is contained in:
Axel Dörfler
2015-07-22 20:44:03 +02:00
parent 06e0f8079f
commit fb7dad2b49
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/app/Roster.h
+1
View File
@@ -182,6 +182,7 @@ private:
const entry_ref* ref,
const BList* messageList, int argc,
const char* const* args,
const char** environment,
team_id* appTeam) const;
status_t _UpdateActiveApp(team_id team) const;
headers/private/app/RosterPrivate.h
+6
View File
@@ -28,6 +28,12 @@ class BRoster::Private {
status_t SendTo(BMessage *message, BMessage *reply, bool mime);
bool IsMessengerValid(bool mime) const;
status_t Launch(const char* mimeType, const entry_ref* ref,
const BList* messageList, int argc, const char* const* args,
const char** environment, team_id* appTeam)
{ return fRoster->_LaunchApp(mimeType, ref, messageList, argc,
args, environment, appTeam); }
status_t ShutDown(bool reboot, bool confirm, bool synchronous)
{ return fRoster->_ShutDown(reboot, confirm, synchronous); }
src/kits/app/Roster.cpp
+15 -10
View File
@@ -922,7 +922,8 @@ BRoster::Launch(const char* mimeType, BMessage* initialMessage,
if (initialMessage != NULL)
messageList.AddItem(initialMessage);
return _LaunchApp(mimeType, NULL, &messageList, 0, NULL, _appTeam);
return _LaunchApp(mimeType, NULL, &messageList, 0, NULL,
(const char**)environ, _appTeam);
}
@@ -933,7 +934,8 @@ BRoster::Launch(const char* mimeType, BList* messageList,
if (mimeType == NULL)
return B_BAD_VALUE;
return _LaunchApp(mimeType, NULL, messageList, 0, NULL, _appTeam);
return _LaunchApp(mimeType, NULL, messageList, 0, NULL,
(const char**)environ, _appTeam);
}
@@ -944,7 +946,8 @@ BRoster::Launch(const char* mimeType, int argc, const char* const* args,
if (mimeType == NULL)
return B_BAD_VALUE;
return _LaunchApp(mimeType, NULL, NULL, argc, args, _appTeam);
return _LaunchApp(mimeType, NULL, NULL, argc, args, (const char**)environ,
_appTeam);
}
@@ -959,7 +962,8 @@ BRoster::Launch(const entry_ref* ref, const BMessage* initialMessage,
if (initialMessage != NULL)
messageList.AddItem(const_cast<BMessage*>(initialMessage));
return _LaunchApp(NULL, ref, &messageList, 0, NULL, _appTeam);
return _LaunchApp(NULL, ref, &messageList, 0, NULL, (const char**)environ,
_appTeam);
}
@@ -970,7 +974,8 @@ BRoster::Launch(const entry_ref* ref, const BList* messageList,
if (ref == NULL)
return B_BAD_VALUE;
return _LaunchApp(NULL, ref, messageList, 0, NULL, appTeam);
return _LaunchApp(NULL, ref, messageList, 0, NULL, (const char**)environ,
appTeam);
}
@@ -981,7 +986,8 @@ BRoster::Launch(const entry_ref* ref, int argc, const char* const* args,
if (ref == NULL)
return B_BAD_VALUE;
return _LaunchApp(NULL, ref, NULL, argc, args, appTeam);
return _LaunchApp(NULL, ref, NULL, argc, args, (const char**)environ,
appTeam);
}
@@ -1821,8 +1827,8 @@ BRoster::_UpdateActiveApp(team_id team) const
*/
status_t
BRoster::_LaunchApp(const char* mimeType, const entry_ref* ref,
const BList* messageList, int argc,
const char* const* args, team_id* _appTeam) const
const BList* messageList, int argc, const char* const* args,
const char** environment, team_id* _appTeam) const
{
DBG(OUT("BRoster::_LaunchApp()"));
@@ -1895,8 +1901,7 @@ BRoster::_LaunchApp(const char* mimeType, const entry_ref* ref,
DBG(OUT(" token: %lu\n", appToken));
// load the app image
thread_id appThread = load_image(argVector.Count(),
const_cast<const char**>(argVector.Args()),
const_cast<const char**>(environ));
const_cast<const char**>(argVector.Args()), environment);
// get the app team
if (appThread >= 0) {