[haiku-commits] r38216 - in haiku/trunk: headers/private/interface src/kits/interface src/servers/app
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 18 Aug 2010 01:23:02 +0200 (CEST)
Author: czeidler
Date: 2010-08-18 01:23:02 +0200 (Wed, 18 Aug 2010)
New Revision: 38216
Changeset: http://dev.haiku-os.org/changeset/38216
Modified:
haiku/trunk/headers/private/interface/WindowStack.h
haiku/trunk/src/kits/interface/WindowStack.cpp
haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Remove unused communication port, pointed out by Axel.
Modified: haiku/trunk/headers/private/interface/WindowStack.h
===================================================================
--- haiku/trunk/headers/private/interface/WindowStack.h 2010-08-17 22:56:19 UTC
(rev 38215)
+++ haiku/trunk/headers/private/interface/WindowStack.h 2010-08-17 23:23:02 UTC
(rev 38216)
@@ -14,8 +14,6 @@
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,
Modified: haiku/trunk/src/kits/interface/WindowStack.cpp
===================================================================
--- haiku/trunk/src/kits/interface/WindowStack.cpp 2010-08-17 22:56:19 UTC
(rev 38215)
+++ haiku/trunk/src/kits/interface/WindowStack.cpp 2010-08-17 23:23:02 UTC
(rev 38216)
@@ -25,31 +25,14 @@
BWindowStack::BWindowStack(BWindow* window)
- :
- fLink(NULL)
{
- port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY,
- "w_stack<app_server");
- if (receivePort >= 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 @@
BWindowStack::_StartMessage(int32 what)
{
fLink->StartMessage(AS_TALK_TO_DESKTOP_LISTENER);
- fLink->Attach<port_id>(fLink->ReceiverPort());
fLink->Attach<int32>(kMagicSATIdentifier);
return fLink->Attach<int32>(what);
}
Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp 2010-08-17 22:56:19 UTC
(rev 38215)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp 2010-08-17 23:23:02 UTC
(rev 38216)
@@ -1158,16 +1158,12 @@
case AS_TALK_TO_DESKTOP_LISTENER:
{
- port_id senderPort;
- link.Read<port_id>(&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;
}
Other related posts:
- » [haiku-commits] r38216 - in haiku/trunk: headers/private/interface src/kits/interface src/servers/app - clemens . zeidler
