From 94b98dff1aca9749901e7f00b4b484eda6b613b9 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 29 Jan 2005 17:36:20 +0000
Subject: [PATCH] Consequently use B_{NULL,PREFERRED}_TOKEN to prevent problems
 with BMessage code checking against B_NULL_TOKEN.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11129 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/app/Messenger.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/kits/app/Messenger.cpp b/src/kits/app/Messenger.cpp
index c93198e9ee..83f380c4bb 100644
--- a/src/kits/app/Messenger.cpp
+++ b/src/kits/app/Messenger.cpp
@@ -43,6 +43,7 @@
 #include <Messenger.h>
 #include <OS.h>
 #include <Roster.h>
+#include <TokenSpace.h>
 
 // Project Includes ------------------------------------------------------------
 #include <AppMisc.h>
@@ -71,7 +72,7 @@ enum {
 */
 BMessenger::BMessenger()
 		  : fPort(-1),
-			fHandlerToken(-1),
+			fHandlerToken(B_NULL_TOKEN),
 			fTeam(-1),
 			fPreferredTarget(false)
 {
@@ -94,7 +95,7 @@ BMessenger::BMessenger()
 */
 BMessenger::BMessenger(const char *signature, team_id team, status_t *result)
 		  : fPort(-1),
-			fHandlerToken(-1),
+			fHandlerToken(B_NULL_TOKEN),
 			fTeam(-1),
 			fPreferredTarget(false)
 {
@@ -119,7 +120,7 @@ BMessenger::BMessenger(const char *signature, team_id team, status_t *result)
 BMessenger::BMessenger(const BHandler *handler, const BLooper *looper,
 					   status_t *result)
 		  : fPort(-1),
-			fHandlerToken(-1),
+			fHandlerToken(B_NULL_TOKEN),
 			fTeam(-1),
 			fPreferredTarget(false)
 {
@@ -141,7 +142,8 @@ BMessenger::BMessenger(const BHandler *handler, const BLooper *looper,
 			BObjectLocker<BLooperList> locker(gLooperList);
 			if (locker.IsLocked() && gLooperList.IsLooperValid(looper)) {
 				fPort = looper->fMsgPort;
-				fHandlerToken = (handler ? _get_object_token_(handler) : -1);
+				fHandlerToken = (handler
+					? _get_object_token_(handler) : B_PREFERRED_TOKEN);
 				fPreferredTarget = !handler;
 				fTeam = looper->Team();
 			} else
@@ -508,7 +510,7 @@ BMessenger::SetTo(team_id team, port_id port, int32 token, bool preferred)
 {
 	fTeam = team;
 	fPort = port;
-	fHandlerToken = token;
+	fHandlerToken = (preferred ? B_PREFERRED_TOKEN : token);
 	fPreferredTarget = preferred;
 }
 
@@ -562,7 +564,7 @@ BMessenger::InitData(const char *signature, team_id team, status_t *result)
 	if (error == B_OK) {
 		fTeam = team;
 		fPort = info.port;
-		fHandlerToken = 0;
+		fHandlerToken = B_PREFERRED_TOKEN;
 		fPreferredTarget = true;
 	}
 	// return the error