Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix allocator mismatch in bug #70207. r=pavlov,arik sr=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@95540 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blizzard%redhat.com
2001-05-19 14:29:25 +00:00
parent f52f4e880a
commit f91c882955
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp
View File

@@ -32,6 +32,10 @@
// so we can do our get_nsIWebBrowser later...
#include <nsIWebBrowser.h>
// for strings
#include <nsXPIDLString.h>
#include <nsReadableUtils.h>
// so we can get callbacks from the mozarea
#include <gtkmozarea.h>
@@ -832,14 +836,18 @@ gtk_moz_embed_get_link_message(GtkMozEmbed *embed)
{
char *retval = nsnull;
EmbedPrivate *embedPrivate;
nsXPIDLCString embedString;
g_return_val_if_fail ((embed != NULL), (char *)NULL);
g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (char *)NULL);
embedPrivate = (EmbedPrivate *)embed->data;
if (embedPrivate->mWindow)
retval = embedPrivate->mWindow->mLinkMessage.ToNewCString();
if (embedPrivate->mWindow) {
*getter_Copies(embedString) =
ToNewCString(embedPrivate->mWindow->mLinkMessage);
retval = strdup(embedString);
}
return retval;
}
@@ -849,14 +857,18 @@ gtk_moz_embed_get_js_status(GtkMozEmbed *embed)
{
char *retval = nsnull;
EmbedPrivate *embedPrivate;
nsXPIDLCString embedString;
g_return_val_if_fail ((embed != NULL), (char *)NULL);
g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (char *)NULL);
embedPrivate = (EmbedPrivate *)embed->data;
if (embedPrivate->mWindow)
retval = embedPrivate->mWindow->mJSStatus.ToNewCString();
if (embedPrivate->mWindow) {
*getter_Copies(embedString) =
ToNewCString(embedPrivate->mWindow->mJSStatus);
retval = strdup(embedString);
}
return retval;
}
@@ -866,14 +878,17 @@ gtk_moz_embed_get_title(GtkMozEmbed *embed)
{
char *retval = nsnull;
EmbedPrivate *embedPrivate;
nsXPIDLCString embedString;
g_return_val_if_fail ((embed != NULL), (char *)NULL);
g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (char *)NULL);
embedPrivate = (EmbedPrivate *)embed->data;
if (embedPrivate->mWindow)
retval = embedPrivate->mWindow->mTitle.ToNewCString();
if (embedPrivate->mWindow) {
*getter_Copies(embedString) = ToNewCString(embedPrivate->mWindow->mTitle);
retval = strdup(embedString);
}
return retval;
}
@@ -883,13 +898,17 @@ gtk_moz_embed_get_location(GtkMozEmbed *embed)
{
char *retval = nsnull;
EmbedPrivate *embedPrivate;
nsXPIDLCString embedString;
g_return_val_if_fail ((embed != NULL), (char *)NULL);
g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (char *)NULL);
embedPrivate = (EmbedPrivate *)embed->data;
retval = embedPrivate->mURI.ToNewCString();
if (embedPrivate->mURI.Length()) {
*getter_Copies(embedString) = ToNewCString(embedPrivate->mURI);
retval = strdup(embedString);
}
return retval;
}