From ee9246d5f5f83019e92d54606bde5f334769f102 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 17 Aug 2010 23:23:02 +0000 Subject: [PATCH] Remove unused communication port, pointed out by Axel. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38216 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/interface/WindowStack.h | 2 -- src/kits/interface/WindowStack.cpp | 20 +------------------- src/servers/app/ServerWindow.cpp | 10 +++------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/headers/private/interface/WindowStack.h b/headers/private/interface/WindowStack.h index aed9aef8e4..02f46e00c1 100644 --- a/headers/private/interface/WindowStack.h +++ b/headers/private/interface/WindowStack.h @@ -14,8 +14,6 @@ public: BWindowStack(BWindow* window); ~BWindowStack(); - status_t InitCheck(); - status_t AddWindow(const BWindow* window); status_t AddWindow(const BMessenger& window); status_t AddWindowAt(const BWindow* window, diff --git a/src/kits/interface/WindowStack.cpp b/src/kits/interface/WindowStack.cpp index 173672bcb9..688a97f291 100644 --- a/src/kits/interface/WindowStack.cpp +++ b/src/kits/interface/WindowStack.cpp @@ -25,31 +25,14 @@ using namespace BPrivate; BWindowStack::BWindowStack(BWindow* window) - : - fLink(NULL) { - port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY, - "w_stack= 0) - fLink = new(std::nothrow) BPrivate::PortLink( - window->fLink->SenderPort(), receivePort); + fLink = window->fLink; } BWindowStack::~BWindowStack() { - if (fLink) - delete_port(fLink->ReceiverPort()); - delete fLink; -} - -status_t -BWindowStack::InitCheck() -{ - if (fLink == NULL) - return B_NO_MEMORY; - return B_OK; } @@ -221,7 +204,6 @@ status_t BWindowStack::_StartMessage(int32 what) { fLink->StartMessage(AS_TALK_TO_DESKTOP_LISTENER); - fLink->Attach(fLink->ReceiverPort()); fLink->Attach(kMagicSATIdentifier); return fLink->Attach(what); } diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index 3584ff199c..ee4cb2e540 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -1158,16 +1158,12 @@ ServerWindow::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link) case AS_TALK_TO_DESKTOP_LISTENER: { - port_id senderPort; - link.Read(&senderPort); - BPrivate::LinkSender sender(senderPort); - BPrivate::PortLinkRef listenerLink(&sender, &link); - if (fDesktop->MessageForListener(fWindow, listenerLink)) + if (fDesktop->MessageForListener(fWindow, fLink)) break; // unhandled message at least send an error if needed if (link.NeedsReply()) { - sender.StartMessage(B_ERROR); - sender.Flush(); + fLink.StartMessage(B_ERROR); + fLink.Flush(); } break; }