mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Something is wrong with my tree...

This commit is contained in:
blakeross%telocity.com 2002-03-17 21:21:30 +00:00
Родитель d03c035489
Коммит 057a05b72e
8 изменённых файлов: 40 добавлений и 125 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
uriloader/base/MANIFEST_IDL
Просмотреть файл

@ -9,4 +9,3 @@ nsIURILoader.idl
nsIDocumentLoader.idl
nsIWebProgress.idl
nsIWebProgressListener.idl
nsIDownload.idl

1
uriloader/base/Makefile.in
Просмотреть файл

@ -54,7 +54,6 @@ XPIDLSRCS = \
nsIURIContentListener.idl \
nsIURILoader.idl \
nsCURILoader.idl \
nsIDownload.idl \
nsIDocumentLoader.idl \
nsIWebProgress.idl \
nsIWebProgressListener.idl \

1
uriloader/base/makefile.win
Просмотреть файл

@ -51,7 +51,6 @@ XPIDLSRCS= \
.\nsIDocumentLoader.idl \
.\nsIWebProgress.idl \
.\nsIWebProgressListener.idl \
.\nsIDownload.idl \
$(NULL)
LIBRARY_NAME=uriloaderbase_s

63
uriloader/exthandler/nsExternalHelperAppService.cpp
Просмотреть файл

@ -39,7 +39,6 @@
#include "nsCURILoader.h"
#include "nsIWebProgress.h"
#include "nsIWebProgressListener.h"
#include "nsIDownload.h"
#include "nsReadableUtils.h"
// used to manage our in memory data source of helper applications
@ -1385,42 +1384,52 @@ nsresult nsExternalAppHandler::ShowProgressDialog()
{
// we are back from the helper app dialog (where the user chooses to save or open), but we aren't
// done processing the load. in this case, throw up a progress dialog so the user can see what's going on...
nsresult rv;
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
nsresult rv = NS_OK;
nsCOMPtr<nsIDownload> dl = do_CreateInstance("@mozilla.org/download;1", &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLString openWith(NS_LITERAL_STRING(""));
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
if (action != nsIMIMEInfo::saveToDisk)
nsCOMPtr<nsIProgressDialog> progressDlg = do_CreateInstance( "@mozilla.org/progressdialog;1", &rv );
if (progressDlg)
{
// Opening with an application; use either description or application file name.
mMimeInfo->GetApplicationDescription(getter_Copies(openWith));
if (openWith.IsEmpty())
// Wire up this progress dialog.
progressDlg->SetSource( mSourceUrl );
progressDlg->SetStartTime( mTimeDownloadStarted );
progressDlg->SetObserver(this);
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
progressDlg->SetTarget(local);
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
if (action != nsIMIMEInfo::saveToDisk)
{
nsCOMPtr<nsIFile> appl;
mMimeInfo->GetPreferredApplicationHandler(getter_AddRefs(appl));
if (appl)
// Opening with an application; use either description or application file name.
nsXPIDLString openWith;
mMimeInfo->GetApplicationDescription(getter_Copies(openWith));
if (openWith.IsEmpty())
{
nsCOMPtr<nsILocalFile> file = do_QueryInterface(appl);
if (file)
nsCOMPtr<nsIFile> appl;
mMimeInfo->GetPreferredApplicationHandler(getter_AddRefs(appl));
if (appl)
{
file->GetUnicodeLeafName(getter_Copies(openWith));
nsCOMPtr<nsILocalFile> file = do_QueryInterface(appl);
if (file)
{
file->GetUnicodeLeafName(getter_Copies(openWith));
}
}
}
// Tell progress dialog what we're opening with.
progressDlg->SetOpeningWith(openWith);
}
// Open the dialog.
rv = progressDlg->Open(nsnull, nsnull);
if(NS_SUCCEEDED(rv))
{
// Send notifications to the dialog.
this->SetWebProgressListener(progressDlg);
}
}
rv = dl->Init(mSourceUrl, local, nsnull, openWith, mTimeDownloadStarted, nsnull);
if (NS_FAILED(rv)) return rv;
dl->SetObserver(this);
nsCOMPtr<nsIWebProgressListener> listener = do_QueryInterface(dl);
if (listener)
SetWebProgressListener(listener);
return rv;
}

60
uriloader/macbuild/uriLoaderIDL.xml
Просмотреть файл

@ -790,20 +790,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -856,16 +842,6 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
<TARGET>
@ -1605,20 +1581,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -1671,16 +1633,6 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
@ -1751,18 +1703,6 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>headers</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>headers</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUPLIST>
</PROJECT>

4
xpfe/components/build/Makefile.in
Просмотреть файл

@ -45,10 +45,6 @@ REQUIRES = xpcom \
dom \
pref \
docshell \
downloadmanager\
webbrowserpersist \
progressDlg \
uriloader \
webshell \
$(NULL)

8
xpfe/components/download-manager/macbuild/DownloadManagerIDL.xml
Просмотреть файл

@ -739,7 +739,7 @@
</LINKORDER>
</TARGET>
<TARGET>
<NAME>downloadmanager.xpt</NAME>
<NAME>download-manager.xpt</NAME>
<SETTINGLIST>
<!-- Settings for "Source Trees" panel -->
@ -798,7 +798,7 @@
<SETTING><NAME>Linker</NAME><VALUE>xpt Linker</VALUE></SETTING>
<SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
<SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
<SETTING><NAME>Targetname</NAME><VALUE>downloadmanager.xpt</VALUE></SETTING>
<SETTING><NAME>Targetname</NAME><VALUE>download-manager.xpt</VALUE></SETTING>
<SETTING><NAME>OutputDirectory</NAME>
<SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
@ -1390,7 +1390,7 @@
<SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
<SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
<PANELDATA><NAME>xpidl Settings</NAME><VALUE>
00010003010113646F776E6C6F61646D616E616765722E787074740000000000
00010003010114646F776E6C6F61642D6D616E616765722E7870740000000000
0000000000000000
</VALUE></PANELDATA>
</SETTINGLIST>
@ -1427,7 +1427,7 @@
<TARGETORDER>
<ORDEREDTARGET><NAME>headers</NAME></ORDEREDTARGET>
<ORDEREDTARGET><NAME>downloadmanager.xpt</NAME></ORDEREDTARGET>
<ORDEREDTARGET><NAME>download-manager.xpt</NAME></ORDEREDTARGET>
</TARGETORDER>
<GROUPLIST>

27
xpfe/components/download-manager/resources/makefile.win
Просмотреть файл

@ -1,27 +0,0 @@
#!nmake
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
DEPTH=..\..\..\..
DIRS= locale
include <$(DEPTH)\config\rules.mak>