зеркало из https://github.com/mozilla/gecko-dev.git
Got rid of outdated API's
This commit is contained in:
Родитель
461b99d29a
Коммит
6044c6f90a
|
@ -35,12 +35,6 @@ interface nsISupportsWString;
|
|||
[scriptable, uuid(9b5c20c0-2348-11d3-a206-00a0cc26da63)]
|
||||
interface nsIImportGeneric : nsISupports
|
||||
{
|
||||
/* Use this when you are using the UI */
|
||||
string GetNextXUL( in nsIDOMWindow wizardWindow,
|
||||
in nsIDOMWindow currentPage,
|
||||
in long currentPageId,
|
||||
out long newPageId);
|
||||
|
||||
/* Use these to prepare for the import */
|
||||
/*
|
||||
"mailInterface" - nsIImportMail interface
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
interface nsIFileSpec;
|
||||
|
||||
[scriptable, uuid(455ca0a0-8de2-11d3-a206-00a0cc26da63)]
|
||||
[noscript, uuid(455ca0a0-8de2-11d3-a206-00a0cc26da63)]
|
||||
interface nsIImportMimeEncode : nsISupports
|
||||
{
|
||||
|
||||
|
|
|
@ -74,9 +74,6 @@ public:
|
|||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
/* string GetNextXUL (in nsIDOMWindow wizardWindow, in nsIDOMWindow currentPage, in long currentPageId, out long newPageId); */
|
||||
NS_IMETHOD GetNextXUL(nsIDOMWindow *wizardWindow, nsIDOMWindow *currentPage, PRInt32 currentPageId, PRInt32 *newPageId, char **_retval);
|
||||
|
||||
/* nsISupports GetData (in string dataId); */
|
||||
NS_IMETHOD GetData(const char *dataId, nsISupports **_retval);
|
||||
|
||||
|
@ -210,30 +207,6 @@ nsImportGenericAddressBooks::~nsImportGenericAddressBooks()
|
|||
NS_IMPL_ISUPPORTS(nsImportGenericAddressBooks, nsIImportGeneric::GetIID());
|
||||
|
||||
|
||||
NS_IMETHODIMP nsImportGenericAddressBooks::GetNextXUL(nsIDOMWindow *wizardWindow, nsIDOMWindow *currentPage, PRInt32 currentPageId, PRInt32 *newPageId, char **_retval)
|
||||
{
|
||||
NS_PRECONDITION(newPageId != nsnull, "null ptr");
|
||||
NS_PRECONDITION(_retval != nsnull, "null ptr");
|
||||
if (!newPageId || !_retval)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
/*
|
||||
Only 1 page required, the list of mailboxes!
|
||||
*/
|
||||
if (currentPageId == 0) {
|
||||
// return the simple mail interface...
|
||||
*_retval = nsCRT::strdup( "iw-simpleaddress.xul");
|
||||
*newPageId = 1;
|
||||
return( NS_OK);
|
||||
}
|
||||
else {
|
||||
*_retval = nsnull;
|
||||
*newPageId = 0;
|
||||
return( NS_OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISupports **_retval)
|
||||
{
|
||||
NS_PRECONDITION(_retval != nsnull, "null ptr");
|
||||
|
|
|
@ -96,9 +96,6 @@ public:
|
|||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
/* string GetNextXUL (in nsIDOMWindow wizardWindow, in nsIDOMWindow currentPage, in long currentPageId, out long newPageId); */
|
||||
NS_IMETHOD GetNextXUL(nsIDOMWindow *wizardWindow, nsIDOMWindow *currentPage, PRInt32 currentPageId, PRInt32 *newPageId, char **_retval);
|
||||
|
||||
/* nsISupports GetData (in string dataId); */
|
||||
NS_IMETHOD GetData(const char *dataId, nsISupports **_retval);
|
||||
|
||||
|
@ -238,30 +235,6 @@ nsImportGenericMail::~nsImportGenericMail()
|
|||
NS_IMPL_ISUPPORTS(nsImportGenericMail, nsIImportGeneric::GetIID());
|
||||
|
||||
|
||||
NS_IMETHODIMP nsImportGenericMail::GetNextXUL(nsIDOMWindow *wizardWindow, nsIDOMWindow *currentPage, PRInt32 currentPageId, PRInt32 *newPageId, char **_retval)
|
||||
{
|
||||
NS_PRECONDITION(newPageId != nsnull, "null ptr");
|
||||
NS_PRECONDITION(_retval != nsnull, "null ptr");
|
||||
if (!newPageId || !_retval)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
/*
|
||||
Only 1 page required, the list of mailboxes!
|
||||
*/
|
||||
if (currentPageId == 0) {
|
||||
// return the simple mail interface...
|
||||
*_retval = nsCRT::strdup( "iw-simplemail.xul");
|
||||
*newPageId = 1;
|
||||
return( NS_OK);
|
||||
}
|
||||
else {
|
||||
*_retval = nsnull;
|
||||
*newPageId = 0;
|
||||
return( NS_OK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsImportGenericMail::GetData(const char *dataId, nsISupports **_retval)
|
||||
{
|
||||
NS_PRECONDITION(_retval != nsnull, "null ptr");
|
||||
|
|
Загрузка…
Ссылка в новой задаче