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

changed signature to original, needed for compatibility

Browse Source 
change AddOnManager deletion


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9226 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2004-10-06 13:49:45 +00:00
parent abc3b04ccf
commit 0a279d91af
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/input/InputServer.cpp
+10 -13
View File
@@ -162,7 +162,8 @@ InputServer::InputServer(void) : BApplication(INPUTSERVER_SIGNATURE),
InputServer::~InputServer(void) InputServer::~InputServer(void)
{ {
CALLED(); CALLED();
delete fAddOnManager; fAddOnManager->Lock();
fAddOnManager->Quit();
#ifdef COMPILE_FOR_R5 #ifdef COMPILE_FOR_R5
delete_port(fAsPort); delete_port(fAsPort);
@@ -183,18 +184,14 @@ void
InputServer::ArgvReceived(int32 argc, char** argv) InputServer::ArgvReceived(int32 argc, char** argv)
{ {
CALLED(); CALLED();
if (2 == argc) { if (2 == argc && (0 == strcmp("-q", argv[1]))) {
if (0 == strcmp("-q", argv[1]) ) { PRINT(("InputServer::ArgvReceived - Restarting ...\n"));
// :TODO: Shutdown and restart the InputServer. status_t quit_status = B_OK;
PRINT(("InputServer::ArgvReceived - Restarting ...\n")); BMessenger msgr = BMessenger(INPUTSERVER_SIGNATURE, -1, &quit_status);
status_t quit_status; if (B_OK == quit_status) {
BMessenger msgr = BMessenger(INPUTSERVER_SIGNATURE, -1, &quit_status); msgr.SendMessage(B_QUIT_REQUESTED);
if (B_OK == quit_status) { } else {
BMessage msg = BMessage(B_QUIT_REQUESTED); PRINTERR(("Unable to send Quit message to running InputServer.\n"));
msgr.SendMessage(&msg);
} else {
PRINTERR(("Unable to send Quit message to running InputServer."));
}
} }
} }
} }
src/servers/input/InputServer.h
+1 -1
View File
@@ -52,7 +52,7 @@
#include <Screen.h> #include <Screen.h>
#include <SupportDefs.h> #include <SupportDefs.h>
#define INPUTSERVER_SIGNATURE "application/x-vnd.OBOS-input_server" #define INPUTSERVER_SIGNATURE "application/x-vnd.Be-input_server"
class BPortLink; class BPortLink;
src/servers/input/input_server.rdef
+1 -1
View File
@@ -7,7 +7,7 @@
application:/x-vnd.obos.app-name application:/x-vnd.obos.app-name
*/ */
resource app_signature "application/x-vnd.OBOS-input_server"; resource app_signature "application/x-vnd.Be-input_server";
/* BEOS:APP_FLAGS : /* BEOS:APP_FLAGS :
00000000 = SINGLE LAUNCH 00000000 = SINGLE LAUNCH