Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restored 14604

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14606 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen 2005-11-01 01:32:49 +00:00
parent 051d07f0fc
commit 094efed434
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/servers/app/ServerWindow.cpp
View File

@ -131,7 +131,7 @@ struct dw_sync_data {
ServerWindow::ServerWindow(const char *title, ServerApp *app,
port_id clientPort, port_id looperPort, int32 handlerID)
: MessageLooper(title && *title ? title : "Unnamed Window"),
fTitle(strdup(title && *title ? title : "Unnamed Window")),
fTitle(title),
fDesktop(app->GetDesktop()),
fServerApp(app),
fWinBorder(NULL),
@ -160,7 +160,7 @@ ServerWindow::~ServerWindow()
delete fWinBorder;
free(fTitle);
free(const_cast<char *>(fTitle));
delete_port(fMessagePort);
BPrivate::gDefaultTokens.RemoveToken(fServerToken);
@ -173,6 +173,11 @@ ServerWindow::~ServerWindow()
status_t
ServerWindow::Init(BRect frame, uint32 look, uint32 feel, uint32 flags, uint32 workspace)
{
if (fTitle == NULL)
fTitle = strdup("Unnamed Window");
if (fTitle == NULL)
return B_NO_MEMORY;
// fMessagePort is the port to which the app sends messages for the server
fMessagePort = create_port(100, fTitle);
if (fMessagePort < B_OK)
@ -299,12 +304,19 @@ ServerWindow::Hide()
void
ServerWindow::SetTitle(const char* newTitle)
{
char *title = strdup(newTitle && *newTitle ? newTitle : "Unnamed Window");
if (!title)
const char* oldTitle = fTitle;
if (newTitle == NULL || !newTitle[0])
fTitle = strdup("Unnamed Window");
else
fTitle = strdup(newTitle);
if (fTitle == NULL) {
fTitle = oldTitle;
return;
free(fTitle);
fTitle = title;
}
free(const_cast<char*>(oldTitle));
if (Thread() >= B_OK) {
char name[B_OS_NAME_LENGTH];

2
src/servers/app/ServerWindow.h
View File

@ -128,7 +128,7 @@ private:
BPoint where);
private:
char * fTitle;
const char* fTitle;
Desktop* fDesktop;
ServerApp* fServerApp;