From aad34b07639972354df6484473b8c7c5fdfb89f1 Mon Sep 17 00:00:00 2001 From: "stuart.morgan%alumni.case.edu" Date: Tue, 13 Nov 2007 15:09:12 +0000 Subject: [PATCH] Bug 402294: Pull nsIDownload from toolkit rather than xpfe for Camino. r=mento a1.9=schrep git-svn-id: svn://10.0.0.236/trunk@239323 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/config/Camino.xcconfig | 2 +- mozilla/camino/src/download/nsDownloadListener.mm | 13 +++++++++---- mozilla/toolkit/components/Makefile.in | 1 + mozilla/xpfe/components/Makefile.in | 4 +++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mozilla/camino/config/Camino.xcconfig b/mozilla/camino/config/Camino.xcconfig index f3ff980d002..86e9d7ce047 100644 --- a/mozilla/camino/config/Camino.xcconfig +++ b/mozilla/camino/config/Camino.xcconfig @@ -14,7 +14,7 @@ GCC_ENABLE_PASCAL_STRINGS = YES GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1 OTHER_LDFLAGS = -lpthread -lm -Wl,-executable_path,../dist/bin LIBRARY_SEARCH_PATHS = ../dist/bin ../dist/lib -HEADER_SEARCH_PATHS = ../dist/include/ ../dist/include/appcomps ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloadmanager ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpcom_obsolete ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon $(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers +HEADER_SEARCH_PATHS = ../dist/include/ ../dist/include/appcomps ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloads ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpcom_obsolete ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon $(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers // Warning settings GCC_WARN_SIGN_COMPARE = YES diff --git a/mozilla/camino/src/download/nsDownloadListener.mm b/mozilla/camino/src/download/nsDownloadListener.mm index b13285969b8..4aa68147cc2 100644 --- a/mozilla/camino/src/download/nsDownloadListener.mm +++ b/mozilla/camino/src/download/nsDownloadListener.mm @@ -150,16 +150,16 @@ nsDownloadListener::GetPercentComplete(PRInt32 *aPercentComplete) return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute PRUint64 amountTransferred; */ +/* readonly attribute PRInt64 amountTransferred; */ NS_IMETHODIMP -nsDownloadListener::GetAmountTransferred(PRUint64 *aAmountTransferred) +nsDownloadListener::GetAmountTransferred(PRInt64 *aAmountTransferred) { return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute PRUint64 size; */ +/* readonly attribute PRInt64 size; */ NS_IMETHODIMP -nsDownloadListener::GetSize(PRUint64 *aSize) +nsDownloadListener::GetSize(PRInt64 *aSize) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -215,6 +215,11 @@ nsDownloadListener::GetState(PRInt16 *aState) return NS_ERROR_NOT_IMPLEMENTED; } +NS_IMETHODIMP +nsDownloadListener::GetReferrer(nsIURI * *aReferrer) { + return NS_ERROR_NOT_IMPLEMENTED; +} + #pragma mark - /* void onProgressChange64 (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long long aCurSelfProgress, in long long aMaxSelfProgress, in long long a diff --git a/mozilla/toolkit/components/Makefile.in b/mozilla/toolkit/components/Makefile.in index 8c34d8b4c8e..909eb695c5b 100644 --- a/mozilla/toolkit/components/Makefile.in +++ b/mozilla/toolkit/components/Makefile.in @@ -139,6 +139,7 @@ endif # MOZ_XUL_APP ifeq ($(MOZ_BUILD_APP),camino) DIRS += autocomplete/public +DIRS += downloads/public endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in index f55fdfd307d..aaae4e347cd 100644 --- a/mozilla/xpfe/components/Makefile.in +++ b/mozilla/xpfe/components/Makefile.in @@ -87,8 +87,10 @@ ifndef MOZ_XULRUNNER DIRS += \ related \ autocomplete \ - download-manager \ $(NULL) +ifneq ($(MOZ_BUILD_APP),camino) +DIRS += download-manager +endif ifndef MOZ_XUL_APP DIRS += \ console \