From 0a279d91afc46cb1ca2caab5971a1e2ea11c8c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Wed, 6 Oct 2004 13:49:45 +0000
Subject: [PATCH] changed signature to original, needed for compatibility
 change AddOnManager deletion

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9226 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/input/InputServer.cpp   | 23 ++++++++++-------------
 src/servers/input/InputServer.h     |  2 +-
 src/servers/input/input_server.rdef |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 27d2c4d7b6..38fb3e2c68 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -162,7 +162,8 @@ InputServer::InputServer(void) : BApplication(INPUTSERVER_SIGNATURE),
 InputServer::~InputServer(void)
 {
 	CALLED();
-	delete fAddOnManager;
+	fAddOnManager->Lock();
+	fAddOnManager->Quit();
 	
 #ifdef COMPILE_FOR_R5
 	delete_port(fAsPort);
@@ -183,18 +184,14 @@ void
 InputServer::ArgvReceived(int32 argc, char** argv)
 {
 	CALLED();
-	if (2 == argc) {
-		if (0 == strcmp("-q", argv[1]) ) {
-			// :TODO: Shutdown and restart the InputServer.
-			PRINT(("InputServer::ArgvReceived - Restarting ...\n"));
-			status_t   quit_status;
-			BMessenger msgr = BMessenger(INPUTSERVER_SIGNATURE, -1, &quit_status);
-			if (B_OK == quit_status) {
-				BMessage   msg  = BMessage(B_QUIT_REQUESTED);
-				msgr.SendMessage(&msg);
-			} else {
-				PRINTERR(("Unable to send Quit message to running InputServer."));
-			}
+	if (2 == argc && (0 == strcmp("-q", argv[1]))) {
+		PRINT(("InputServer::ArgvReceived - Restarting ...\n"));
+		status_t quit_status = B_OK;
+		BMessenger msgr = BMessenger(INPUTSERVER_SIGNATURE, -1, &quit_status);
+		if (B_OK == quit_status) {
+			msgr.SendMessage(B_QUIT_REQUESTED);
+		} else {
+			PRINTERR(("Unable to send Quit message to running InputServer.\n"));
 		}
 	}
 }
diff --git a/src/servers/input/InputServer.h b/src/servers/input/InputServer.h
index 28982cab1a..e5ccc3cf4b 100644
--- a/src/servers/input/InputServer.h
+++ b/src/servers/input/InputServer.h
@@ -52,7 +52,7 @@
 #include <Screen.h>
 #include <SupportDefs.h>
 
-#define INPUTSERVER_SIGNATURE "application/x-vnd.OBOS-input_server"
+#define INPUTSERVER_SIGNATURE "application/x-vnd.Be-input_server"
 
 class BPortLink;
 
diff --git a/src/servers/input/input_server.rdef b/src/servers/input/input_server.rdef
index 8f7a0f1fb4..e50e9ab854 100644
--- a/src/servers/input/input_server.rdef
+++ b/src/servers/input/input_server.rdef
@@ -7,7 +7,7 @@
    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 :
    00000000 = 							   SINGLE LAUNCH