aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/MozDownload.cpp5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aa85bcfb5..f999e1c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-02-27 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/MozDownload.cpp:
+
+ Try to fix the build with 1.7 branch.
+
+2005-02-27 Christian Persch <chpe@cvs.gnome.org>
+
* embed/ephy-embed-event.h:
* embed/mozilla/EventContext.cpp:
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 140eb98fc..248286ff1 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -60,6 +60,7 @@
#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
#undef MOZILLA_STRICT_API
+#include <nsMemory.h>
#include <errno.h>
#include <stdlib.h>
@@ -379,8 +380,8 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
nsEmbedCString cDesc;
NS_UTF16ToCString (description, NS_CSTRING_ENCODING_UTF8, cDesc);
#else
- char *mimeType;
- rv = mMIMEInfo->GetMIMEType (&mimeType);
+ char *mime;
+ rv = mMIMEInfo->GetMIMEType (&mime);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
if (mime)