Remember the window title even if we don't have a window controller. (bug 157283)

This commit is contained in:
pinkerton%netscape.com 2002-07-29 18:16:07 +00:00
Родитель 8cd61774d2
Коммит d57ab9b904
4 изменённых файлов: 56 добавлений и 64 удалений

Просмотреть файл

@ -353,23 +353,21 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
// We must be the primary content area to actually set the title, but we
// still want to hold onto the title in case we become the primary later.
if (mWindowController) {
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary )
[[mWindowController window] setTitle:mTitle];
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary && mWindowController )
[[mWindowController window] setTitle:mTitle];
// Always set the tab.
if (title && ![title isEqualToString:@""])

Просмотреть файл

@ -353,23 +353,21 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
// We must be the primary content area to actually set the title, but we
// still want to hold onto the title in case we become the primary later.
if (mWindowController) {
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary )
[[mWindowController window] setTitle:mTitle];
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary && mWindowController )
[[mWindowController window] setTitle:mTitle];
// Always set the tab.
if (title && ![title isEqualToString:@""])

Просмотреть файл

@ -353,23 +353,21 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
// We must be the primary content area to actually set the title, but we
// still want to hold onto the title in case we become the primary later.
if (mWindowController) {
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary )
[[mWindowController window] setTitle:mTitle];
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary && mWindowController )
[[mWindowController window] setTitle:mTitle];
// Always set the tab.
if (title && ![title isEqualToString:@""])

Просмотреть файл

@ -353,23 +353,21 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
// We must be the primary content area to actually set the title, but we
// still want to hold onto the title in case we become the primary later.
if (mWindowController) {
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary )
[[mWindowController window] setTitle:mTitle];
NSString* newTitle = nil;
if (mOffline) {
if (title && ![title isEqualToString:@""])
newTitle = [title stringByAppendingString: @" [Working Offline]"];
else
newTitle = [NSString stringWithString:@"Untitled [Working Offline]"];
mTitle = [newTitle retain];
}
else {
if (!title || [title isEqualToString:@""])
title = [NSString stringWithString:NSLocalizedString(@"UntitledPageTitle", @"")];
mTitle = [title retain];
}
if ( mIsPrimary && mWindowController )
[[mWindowController window] setTitle:mTitle];
// Always set the tab.
if (title && ![title isEqualToString:@""])