aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-07-15 06:20:22 +0800
committerChristian Persch <chpe@src.gnome.org>2007-07-15 06:20:22 +0800
commit92a7c6b8b3dc7b618c36d29332fc7d2bbee22681 (patch)
tree5a7e75d8ae3a0f76825179804b047938540eb213 /embed/mozilla
parentc98708b8012ec81f3bc055eeb0be5a20f87a743a (diff)
downloadgsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar.gz
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar.bz2
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar.lz
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar.xz
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.tar.zst
gsoc2013-epiphany-92a7c6b8b3dc7b618c36d29332fc7d2bbee22681.zip
It's yet another API change!
2007-07-14 Christian Persch <chpe@gnome.org> * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphySingle.cpp: * embed/mozilla/MozDownload.cpp: It's yet another API change! svn path=/trunk/; revision=7158
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/ContentHandler.cpp3
-rw-r--r--embed/mozilla/EphySingle.cpp2
-rw-r--r--embed/mozilla/MozDownload.cpp5
3 files changed, 9 insertions, 1 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 248db6056..0510aa3f1 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -438,6 +438,8 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
info = g_strdup_printf ("gnome-browse-to-file:%d", gtk_get_current_event_time());
}
+ /* See http://bugzilla.gnome.org/show_bug.cgi?id=456945 */
+#ifndef HAVE_GECKO_1_9
if (info != NULL)
{
nsString desc;
@@ -454,6 +456,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
{
mimeInfo->SetApplicationDescription (nsString ());
}
+#endif /* HAVE_GECKO_1_9 */
if (mAction == CONTENT_ACTION_OPEN)
{
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 64e8c8399..74eaf21d6 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -350,7 +350,7 @@ mozilla_cookie_to_ephy_cookie (nsICookie *cookie)
#ifdef HAVE_GECKO_1_9
PRBool isHttpOnly = PR_FALSE;
- cookie2->GetHttpOnly (&isHttpOnly);
+ cookie2->GetIsHttpOnly (&isHttpOnly);
info->is_http_only = isHttpOnly != PR_FALSE;
#endif
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index b1de84944..eed7adcd9 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -323,6 +323,10 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
}
else if (NS_SUCCEEDED (aStatus))
{
+ /* see http://bugzilla.gnome.org/show_bug.cgi?id=456945 */
+#ifdef HAVE_GECKO_1_9
+ return NS_OK;
+#else
GnomeVFSMimeApplication *helperApp;
nsCString mimeType;
rv = mMIMEInfo->GetMIMEType (mimeType);
@@ -374,6 +378,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
g_strfreev (str);
}
+#endif /* HAVE_GECKO_1_9 */
}
}