aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-01-06 04:57:00 +0800
committerChristian Persch <chpe@src.gnome.org>2005-01-06 04:57:00 +0800
commit4953a4bdb2cb833574b4188f6795e796b4ff9a2d (patch)
tree56df3b2babc547afceaabe3f57b6304ce8456644
parent1bb2458bbd832096bb10d850524c560129224b46 (diff)
downloadgsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar.gz
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar.bz2
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar.lz
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar.xz
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.tar.zst
gsoc2013-epiphany-4953a4bdb2cb833574b4188f6795e796b4ff9a2d.zip
Remove trailing whitespace.
2005-01-05 Christian Persch <chpe@cvs.gnome.org> * data/Makefile.am: Remove trailing whitespace. * embed/mozilla/MozDownload.cpp: Fix build with moz 1.7.
-rw-r--r--ChangeLog10
-rw-r--r--data/Makefile.am2
-rw-r--r--embed/mozilla/MozDownload.cpp3
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 25d827475..6157b60db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2005-01-05 Christian Persch <chpe@cvs.gnome.org>
+ * data/Makefile.am:
+
+ Remove trailing whitespace.
+
+ * embed/mozilla/MozDownload.cpp:
+
+ Fix build with moz 1.7.
+
+2005-01-05 Christian Persch <chpe@cvs.gnome.org>
+
* configure.ac:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
diff --git a/data/Makefile.am b/data/Makefile.am
index 184d8ca69..8aca13b4f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -67,7 +67,7 @@ EXTRA_DIST = \
$(extensionschema_DATA) \
$(pkgconfig_DATA) \
$(default_prefs_in_FILES) \
- $(xsl_DATA) \
+ $(xsl_DATA) \
check-mime.py
DISTCLEANFILES = \
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index e65974476..31051822c 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -217,6 +217,8 @@ MozDownload::GetSize(PRUint64 *aSize)
return NS_ERROR_NOT_IMPLEMENTED;
}
+#endif /* MOZ_NSIDOWNLOAD_GETSIZE */
+
NS_IMETHODIMP
MozDownload::GetStartTime(PRInt64 *aStartTime)
{
@@ -225,7 +227,6 @@ MozDownload::GetStartTime(PRInt64 *aStartTime)
return NS_OK;
}
-#endif /* MOZ_NSIDOWNLOAD_GETSIZE */
NS_IMETHODIMP
MozDownload::GetDisplayName(PRUnichar * *aDisplayName)