aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-12-19 08:10:38 +0800
committerChristian Persch <chpe@src.gnome.org>2004-12-19 08:10:38 +0800
commita2f961edc8727333836550c7923886c4b7f24897 (patch)
tree9832b8b381ca2d1c820d1ce77b720649a7aede49
parent323baedeb83c11c4640b77f4ce96b192eeb3c3f7 (diff)
downloadgsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar.gz
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar.bz2
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar.lz
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar.xz
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.tar.zst
gsoc2013-epiphany-a2f961edc8727333836550c7923886c4b7f24897.zip
Mozilla API change.
2004-12-19 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * embed/mozilla/MozDownload.cpp: Mozilla API change.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac20
-rw-r--r--embed/mozilla/MozDownload.cpp16
3 files changed, 41 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d20c473fc..ac1307f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-19 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+ * embed/mozilla/MozDownload.cpp:
+
+ Mozilla API change.
+
2004-12-18 Christian Persch <chpe@cvs.gnome.org>
* src/window-commands.c: (toolbar_editor_destroy_cb),
diff --git a/configure.ac b/configure.ac
index 59db7cf64..53ff7e214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AM_MAINTAINER_MODE
if test "x$enable_maintainer_mode" = "xyes"; then
AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
enable_debug=yes
+ MORE_WARN_FLAGS="-Wdeclaration-after-statement"
DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
fi
@@ -408,12 +409,27 @@ AC_COMPILE_IFELSE(
AC_MSG_RESULT([$result])
+dnl Since 1.8a6
+
+AC_MSG_CHECKING([for nsIDownload::GetSize])
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <uriloader/nsIDownload.h>]],
+ [[nsIDownload *p;
+ p->GetSize(nsnull);]]
+ )],
+ [AC_DEFINE([MOZ_NSIDOWNLOAD_GETSIZE],[1],[Define if nsIDownload::GetSize exists]) result=yes],
+ [result=no])
+
+AC_MSG_RESULT([$result])
+
dnl check for broken reload in GtkMozEmbed
dnl This is fixed since 1.7.4 on 1.7 branch, and since 1.8a3 on trunk
AC_MSG_CHECKING([for broken reload])
-if $PKG_CONFIG --atleast-version 1.8a3 $MOZILLA-gtkmozembed; then
+if $PKG_CONFIG --atleast-version 1.7.5 $MOZILLA-gtkmozembed; then
broken_reload=no
else
broken_reload="couldn't autodetect, assuming yes"
@@ -473,7 +489,7 @@ dnl Add warning flags
dnl *******************************
AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
+AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $MOZILLA_WARN_CXXFLAGS"
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 48b7cf79f..103301425 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -193,6 +193,22 @@ MozDownload::GetPercentComplete(PRInt32 *aPercentComplete)
return NS_OK;
}
+#ifdef MOZ_NSIDOWNLOAD_GETSIZE
+/* readonly attribute PRUint64 amountTransferred; */
+NS_IMETHODIMP
+MozDownload::GetAmountTransferred(PRUint64 *aAmountTransferred)
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* readonly attribute PRUint64 size; */
+NS_IMETHODIMP
+MozDownload::GetSize(PRUint64 *aSize)
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+#endif /* MOZ_NSIDOWNLOAD_GETSIZE */
+
NS_IMETHODIMP
MozDownload::GetTotalProgress(PRInt32 *aTotalProgress)
{