зеркало из https://github.com/mozilla/gecko-dev.git
Bug 278503 Remove file nsMimeAddress.cpp
patch by mikael@parknert.se r=ducarroz sr=bienvenu
This commit is contained in:
timeless%mozdev.org
Родитель
35f255b89b
Коммит
5a34be7725
|
|
@ -92,7 +92,6 @@ endif
|
|||
CPPSRCS = \
|
||||
nsMimeObjectClassAccess.cpp \
|
||||
nsMimeConverter.cpp \
|
||||
nsMimeAddress.cpp \
|
||||
mimecont.cpp \
|
||||
mimeebod.cpp \
|
||||
mimeenc.cpp \
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
#include "nsIMsgSMIMEHeaderSink.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIX509Cert.h"
|
||||
#include "nsIMsgHeaderParser.h"
|
||||
|
||||
|
||||
#define MIME_SUPERCLASS mimeEncryptedClass
|
||||
|
|
@ -191,7 +192,17 @@ PRBool MimeEncryptedCMS_encrypted_p (MimeObject *obj)
|
|||
|
||||
// extern MimeMessageClass mimeMessageClass; /* gag */
|
||||
|
||||
extern int ParseRFC822Addresses (const char *line, char **names, char **addresses);
|
||||
static void ParseRFC822Addresses (const char *line, nsXPIDLCString &names, nsXPIDLCString &addresses)
|
||||
{
|
||||
PRUint32 numAddresses;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res))
|
||||
{
|
||||
pHeader->ParseHeaderAddresses(nsnull, line, getter_Copies(names), getter_Copies(addresses), &numAddresses);
|
||||
}
|
||||
}
|
||||
|
||||
extern char *IMAP_CreateReloadAllPartsUrl(const char *url);
|
||||
|
||||
|
|
@ -258,7 +269,7 @@ PRBool MimeCMSHeadersAndCertsMatch(MimeObject *obj,
|
|||
s = MimeHeaders_get(msg_headers, HEADER_FROM, PR_FALSE, PR_FALSE);
|
||||
if (s)
|
||||
{
|
||||
ParseRFC822Addresses(s, getter_Copies(from_name), getter_Copies(from_addr));
|
||||
ParseRFC822Addresses(s, from_name, from_addr);
|
||||
PR_FREEIF(s);
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +277,7 @@ PRBool MimeCMSHeadersAndCertsMatch(MimeObject *obj,
|
|||
s = MimeHeaders_get(msg_headers, HEADER_SENDER, PR_FALSE, PR_FALSE);
|
||||
if (s)
|
||||
{
|
||||
ParseRFC822Addresses(s, getter_Copies(sender_name), getter_Copies(sender_addr));
|
||||
ParseRFC822Addresses(s, sender_name, sender_addr);
|
||||
PR_FREEIF(s);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
#include "nsCRT.h"
|
||||
#include "nsEscape.h"
|
||||
#include "nsMsgMessageFlags.h"
|
||||
#include "nsMimeAddress.h"
|
||||
#include "comi18n.h"
|
||||
#include "nsMailHeaders.h"
|
||||
#include "msgCore.h"
|
||||
|
|
|
|||
|
|
@ -1,133 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla 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/MPL/
|
||||
*
|
||||
* 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 the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Pierre Phaneuf <pp@ludusdesign.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "plstr.h"
|
||||
#include "prmem.h"
|
||||
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsMsgBaseCID.h"
|
||||
#include "nsIMsgHeaderParser.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
int
|
||||
ParseRFC822Addresses (const char *line,
|
||||
char **names,
|
||||
char **addresses)
|
||||
{
|
||||
PRUint32 numAddresses;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pHeader)
|
||||
{
|
||||
pHeader->ParseHeaderAddresses(nsnull, line, names, addresses, &numAddresses);
|
||||
return numAddresses;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Given a string which contains a list of RFC822 addresses, returns a
|
||||
comma-separated list of just the `mailbox' portions.
|
||||
*/
|
||||
char *
|
||||
ExtractRFC822AddressMailboxes (const char *line)
|
||||
{
|
||||
char *retVal = NULL;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pHeader)
|
||||
pHeader->ExtractHeaderAddressMailboxes(NULL, line, &retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
|
||||
/* Given a string which contains a list of RFC822 addresses, returns a
|
||||
comma-separated list of just the `user name' portions. If any of
|
||||
the addresses doesn't have a name, then the mailbox is used instead.
|
||||
|
||||
The names are *unquoted* and therefore cannot be re-parsed in any way.
|
||||
They are, however, nice and human-readable.
|
||||
*/
|
||||
char *
|
||||
ExtractRFC822AddressNames (const char *line)
|
||||
{
|
||||
char *retVal = NULL;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pHeader)
|
||||
pHeader->ExtractHeaderAddressNames(NULL, line, &retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
/* Like ExtractRFC822AddressNames(), but only returns the first name
|
||||
in the list, if there is more than one.
|
||||
*/
|
||||
char *
|
||||
ExtractRFC822AddressName (const char *line)
|
||||
{
|
||||
char *retVal = NULL;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pHeader)
|
||||
pHeader->ExtractHeaderAddressName(NULL, line, &retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
/* Given a string which contains a list of RFC822 addresses, returns a new
|
||||
string with the same data, but inserts missing commas, parses and reformats
|
||||
it, and wraps long lines with newline-tab.
|
||||
*/
|
||||
char *
|
||||
ReformatRFC822Addresses (const char *line)
|
||||
{
|
||||
char *retVal = NULL;
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIMsgHeaderParser> pHeader = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID, &res);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pHeader)
|
||||
pHeader->ReformatHeaderAddresses(NULL, line, &retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla 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/MPL/
|
||||
*
|
||||
* 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 the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/*
|
||||
* This interface is implemented by libmime. This interface is used by
|
||||
* a Content-Type handler "Plug In" (i.e. vCard) for accessing various
|
||||
* internal information about the object class system of libmime. When
|
||||
* libmime progresses to a C++ object class, this would probably change.
|
||||
*/
|
||||
#ifndef nsMimeAddress_h_
|
||||
#define nsMimeAddress_h_
|
||||
|
||||
#include "prtypes.h"
|
||||
|
||||
int
|
||||
ParseRFC822Addresses (const char *line,
|
||||
char **names,
|
||||
char **addresses);
|
||||
|
||||
char *
|
||||
ExtractRFC822AddressMailboxes (const char *line);
|
||||
|
||||
/* Given a string which contains a list of RFC822 addresses, returns a
|
||||
comma-separated list of just the `user name' portions. If any of
|
||||
the addresses doesn't have a name, then the mailbox is used instead.
|
||||
|
||||
The names are *unquoted* and therefore cannot be re-parsed in any way.
|
||||
They are, however, nice and human-readable.
|
||||
*/
|
||||
char *
|
||||
ExtractRFC822AddressNames (const char *line);
|
||||
|
||||
/* Like ExtractRFC822AddressNames(), but only returns the first name
|
||||
in the list, if there is more than one.
|
||||
*/
|
||||
char *
|
||||
ExtractRFC822AddressName (const char *line);
|
||||
|
||||
/* Given a string which contains a list of RFC822 addresses, returns a new
|
||||
string with the same data, but inserts missing commas, parses and reformats
|
||||
it, and wraps long lines with newline-tab.
|
||||
*/
|
||||
char *
|
||||
ReformatRFC822Addresses (const char *line);
|
||||
|
||||
#endif /* nsMimeAddress_h_ */
|
||||
Загрузка…
Ссылка в новой задаче