Mailto landing (ifdef MOZ_MAIL_COMPOSE). Aproved by mwelch.

Turns off MOZILLA_30, which Jamie says is probably a bad idea;
this will be reworked in the future.

lib/libmime/Makefile

@@ -52,8 +52,11 @@ CSRCS		= \
 		  addr.c \
 		  $(NULL)
 
-#		  mimevcrd.c \
-
+ifdef MOZ_MAIL_COMPOSE
+CSRCS		+= \
+		  mimevcrd.c \
+		  $(NULL)
+endif
 
 REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
 
@@ -68,7 +71,11 @@ endif
 
 INCLUDES 	+= -I./
 
-DEFINES += -DMOZILLA_30 -DNO_SECURITY
+ifndef MOZ_MAIL_COMPOSE
+DEFINES += -DMOZILLA_30
+endif
+
+DEFINES += -DNO_SECURITY
 
 #
 # Building the "mimefilt" executable, which reads a message from stdin and

lib/libmime/addr.c

@@ -1069,9 +1069,11 @@ MSG_RemoveDuplicateAddresses (const char *addrs,
       if (!found && removeAliasesToMe)
 	  {
 #ifndef MOZILLA_30
+#if CPLUS_PLUS_IN_C_FILE   /* C++ in C file! */
 		  found = MSG_Prefs::IsEmailAddressAnAliasForMe (a_array1[i]);
 		  if (found)
 			  break;
+#endif
 #endif /* MOZILLA_30 */
 	  }
 

lib/libmime/mimedrft.c

@@ -19,7 +19,6 @@
 /* mimedrft.c --- save and restore drafts of unfinished messages
  */
 
-#ifdef MIME_DRAFTS /* whole file */
 
 #include "xp.h"
 #include "xpgetstr.h"
@@ -30,6 +29,11 @@
 #include "mimemsg.h"
 #include "mimeenc.h" /* jrm - needed to make it build 97/02/21 */
 
+/* ifdef MIME_DRAFTS has to be after the includes
+ * since that's where MIME_DRAFTS will be defined, if it is.
+ */
+#ifdef MIME_DRAFTS /* whole file */
+
 #define HEADER_NNTP_POSTING_HOST             "NNTP-Posting-Host"
 
 extern int MK_UNABLE_TO_OPEN_TMP_FILE;
@@ -511,11 +515,13 @@ mime_parse_stream_complete (NET_StreamClass *stream)
 	
   if (cpane && mdd->url->fe_data) 
   {
+#ifdef MOZ_MAIL_NEWS
 	  if ( mdd->format_out != FO_CMDLINE_ATTACHMENTS ) 
 	  {
 		  MSG_SetPostDeliveryActionInfo (cpane, mdd->url->fe_data);
 	  }
 	  else
+#endif /* MOZ_MAIL_NEWS */
 	  {
 		  MSG_SetAttachmentList ( cpane, (MSG_AttachmentData*)(mdd->url->fe_data));
 	  }

lib/libmime/mimei.c

@@ -153,8 +153,10 @@ mime_find_class (const char *content_type, MimeHeaders *hdrs,
 	  else if (!strcasecomp(content_type+5,		"plain"))
 		class = (MimeObjectClass *)&mimeInlineTextPlainClass;
 #ifndef MOZILLA_30
+#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
 	  else if (!strcasecomp(content_type+5,		"x-vcard"))
 		class = (MimeObjectClass *)&mimeInlineTextVCardClass;
+#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
 #ifdef MOZ_CALENDAR
 	  else if (!strcasecomp(content_type+5,		"calendar"))
 		class = (MimeObjectClass *)&mimeInlineTextCalendarClass;

lib/libmime/mimemoz.c

@@ -1102,11 +1102,13 @@ MIME_MessageConverter (int format_out, void *closure,
       )
     {
 #ifndef MOZILLA_30
+#ifdef MOZ_MAIL_NEWS
       MSG_Pane* pane = MSG_FindPane(context, MSG_MESSAGEPANE);
       msd->options->rot13_p = FALSE;
       if (pane) {
         msd->options->rot13_p = MSG_ShouldRot13Message(pane);
       }
+#endif /* MOZ_MAIL_NEWS */
 #else  /* MOZILLA_30 */
 
       XP_Bool all_headers_p = FALSE;
@@ -2221,6 +2223,7 @@ MIME_RegisterConverters(void)
 
 #ifndef MOZILLA_30
 
+#ifdef MOZ_MAIL_NEWS
 int
 MIME_DisplayAttachmentPane(MWContext* context)
 {
@@ -2239,6 +2242,7 @@ MIME_DisplayAttachmentPane(MWContext* context)
     }
     return 0;
 }
+#endif /* MOZ_MAIL_NEWS */
 
 
 /* This struct is the state we used in MIME_VCardConverter() */

lib/libmime/mimemsg.c

@@ -36,7 +36,9 @@ static int MimeMessage_parse_eof (MimeObject *, XP_Bool);
 static int MimeMessage_close_headers (MimeObject *obj);
 static int MimeMessage_write_headers_html (MimeObject *);
 
+#ifndef MOZ_MAIL_COMPOSE
 extern MimeObjectClass mimeFilterClass;
+#endif /* MOZ_MAIL_COMPOSE */
 
 #ifdef XP_UNIX
 extern void MimeHeaders_do_unix_display_hook_hack(MimeHeaders *);
@@ -417,7 +419,9 @@ MimeMessage_parse_eof (MimeObject *obj, XP_Bool abort_p)
 	   obj->options->decompose_file_p &&
 	   obj->options->done_parsing_outer_headers &&
 	   ! obj->options->is_multipart_msg &&
+#ifndef MOZ_MAIL_COMPOSE
 	   ! mime_typep(obj, (MimeObjectClass*) &mimeFilterClass) &&
+#endif /* MOZ_MAIL_COMPOSE */
 	   obj->options->decompose_file_close_fn ) {
 	status = obj->options->decompose_file_close_fn (
 											   obj->options->stream_closure );
@@ -453,7 +457,9 @@ MimeMessage_add_child (MimeObject *parent, MimeObject *child)
   if ( parent->options &&
 	   parent->options->decompose_file_p &&
 	   ! parent->options->is_multipart_msg &&
+#ifndef MOZ_MAIL_COMPOSE
 	   ! mime_typep(child, (MimeObjectClass*) &mimeFilterClass) &&
+#endif /* MOZ_MAIL_COMPOSE */
 	   parent->options->decompose_file_init_fn ) {
 	int status = 0;
 	status = parent->options->decompose_file_init_fn (

lib/libmime/mimevcrd.c

@@ -32,6 +32,8 @@
 MimeDefClass(MimeInlineTextVCard, MimeInlineTextVCardClass,
 			 mimeInlineTextVCardClass, &MIME_SUPERCLASS);
 
+MimeInlineTextVCardClass mimeInlineTextVCardClass;
+
 static int MimeInlineTextVCard_parse_line (char *, int32, MimeObject *);
 static int MimeInlineTextVCard_parse_eof (MimeObject *, XP_Bool);
 static int MimeInlineTextVCard_parse_begin (MimeObject *obj);