mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-23 19:09:49 +00:00
Changes for qnx(photon) platform. They should not affect building/runtime other platforms.
Fixed the setting of window title in the embedded mozserver.
This commit is contained in:
parent
40aec24651
commit
03491c71e4
@ -402,7 +402,8 @@ EmbedWindow::SetTitle(const PRUnichar *aTitle)
|
||||
PtCallbackInfo_t cbinfo;
|
||||
PtMozillaInfoCb_t info;
|
||||
nsString mTitleString(aTitle);
|
||||
char *str;
|
||||
const char *str;
|
||||
int to_free = 0;
|
||||
|
||||
mTitle = aTitle;
|
||||
|
||||
@ -419,19 +420,23 @@ EmbedWindow::SetTitle(const PRUnichar *aTitle)
|
||||
|
||||
/* see if the title is empty */
|
||||
if( mTitleString.Length() == 0 ) {
|
||||
if( moz->EmbedRef->mURI.Length() > 0 )
|
||||
if( moz->EmbedRef->mURI.Length() > 0 ) {
|
||||
str = ToNewCString( moz->EmbedRef->mURI );
|
||||
to_free = 1;
|
||||
}
|
||||
else {
|
||||
str = (char*) nsMemory::Alloc( 2 );
|
||||
str[0] = ' '; str[1] = 0;
|
||||
str = " ";
|
||||
}
|
||||
}
|
||||
else str = ToNewCString(mTitleString);
|
||||
else {
|
||||
NS_ConvertUCS2toUTF8 theUnicodeString( mTitleString );
|
||||
str = theUnicodeString.get( );
|
||||
}
|
||||
|
||||
info.data = str;
|
||||
info.data = (char*) str;
|
||||
PtInvokeCallbackList(cb, (PtWidget_t *) moz, &cbinfo);
|
||||
|
||||
nsMemory::Free( (void*)str );
|
||||
if( to_free ) nsMemory::Free( (void*)str );
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user