part of messenger Mac landing

mailnews/compose/public/MsgCompGlue.h

@@ -3,6 +3,7 @@
 #ifndef _MsgCompGlue_H_
 #define _MsgCompGlue_H_
 
+#include "mimeenc.h"
 #include "xpgetstr.h"
 #include "xp_qsort.h"
 #include "msgcom.h"
@@ -161,7 +162,6 @@ public:
 	virtual XP_Bool IMAPListMailboxExist() {return PR_FALSE;}
 };
 
-const int MK_MSG_OUTBOX_L10N_NAME_OLD = 0;
 #define QUEUE_FOLDER_NAME_OLD	MSG_GetSpecialFolderName(MK_MSG_OUTBOX_L10N_NAME_OLD)
 
 
@@ -246,6 +246,11 @@ extern char *msg_MagicFolderName(MSG_Prefs* prefs, uint32 flag, int *pStatus);
 #undef FE_Progress
 #define FE_Progress(cx,msg) printf("Progress: %s\n", msg)
 
+extern int MISC_ValidateReturnAddress (MWContext *,const char *);
+extern History_entry * SHIST_GetCurrent(History *);
+
+
+
 /*QUESTION: can we remove #ifdef XP_OS2 ?*/
 /*REMARK: as #define MOZ_NEWADDR is always true, we should remove it when used*/
 

mailnews/compose/src/msgCompGlue.cpp

@@ -65,6 +65,7 @@ CCCDataObject		INTL_CreateCharCodeConverter() {return NULL;}
 int16				INTL_GetCSIWinCSID(INTL_CharSetInfo) {return 2;}
 INTL_CharSetInfo	LO_GetDocumentCharacterSetInfo(MWContext *) {return NULL;}
 int16				INTL_GetCSIDocCSID(INTL_CharSetInfo obj) {return 2;}
+int16				INTL_DefaultWinCharSetID(MWContext *) {return 2;}
 int16				INTL_DefaultMailCharSetID(int16 csid) {return 2;}
 int16				INTL_DefaultNewsCharSetID(int16 csid) {return 2;}
 void				INTL_MessageSendToNews(XP_Bool toNews) {return;}
@@ -250,21 +251,27 @@ int					strncasecomp (const char *, const char *, int ) {return nsnull;}
 char *				strcasestr (const char * str, const char * substr) {return NULL;}
 
 XP_FILE_NATIVE_PATH WH_FileName (const char *, XP_FileType ) {return NULL;}
+XP_Bool				isMacFile(char* filename) {return PR_FALSE;}
 
 HJ10196
 History_entry *		SHIST_GetCurrent(History *) {return NULL;}
 int					MISC_ValidateReturnAddress (MWContext *,const char *) {return nsnull;}
 char *				msg_MagicFolderName(MSG_Prefs* prefs, uint32 flag, int *pStatus) {return NULL;}
 
+time_t 				GetTimeMac()	{return 0;}
+
+
 extern "C" {
-int MK_MSG_SAVE_TEMPLATE;
-int MK_MSG_INVALID_FOLLOWUP_TO_HEADER;
-int MK_MSG_INVALID_NEWS_HEADER;
-int	MK_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS;
-int MK_MSG_FAILED_COPY_OPERATION;
 
 void FE_MsgShowHeaders(MSG_Pane *, MSG_HEADER_SET) {return;}
 HJ98703
 }
 
-
+#include "allxpstr.h"
+extern "C" {
+        int MK_MSG_SAVE_TEMPLATE = XP_MSG_BASE + 1389;
+        int MK_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS = XP_MSG_BASE + 1455;
+        int MK_MSG_FAILED_COPY_OPERATION = XP_MSG_BASE + 0;
+        int MK_MSG_INVALID_FOLLOWUP_TO_HEADER = XP_MSG_BASE + 0;
+        int MK_MSG_INVALID_NEWS_HEADER = XP_MSG_BASE + 0;
+}

mailnews/compose/src/nsComposeAppCore.cpp

@@ -58,6 +58,7 @@
 #include "nsIXULWindowCallbacks.h"
 #include "nsIDocumentViewer.h"
 #include "nsIRDFResource.h"
+#include "nsINetService.h"
 #include "nsFileSpec.h"
 #include "nsFileStream.h"
 
@@ -77,6 +78,7 @@ static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID);
 
 static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
 static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
+static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID); 
 
 // defined in msgCompGlue.cpp
 extern char * INTL_GetDefaultMailCharset(void);
@@ -578,14 +580,19 @@ nsComposeAppCore::NewMessage(nsAutoString& aUrl,
                                       (nsISupports**)&appShell);
     if (NS_FAILED(rv)) return rv;
 
-	nsIURL* url;
-	nsIWebShellWindow* newWindow;
-  
-	rv = NS_NewURL(&url, aUrl);
-	if (NS_FAILED(rv)) {
-	  goto done;
+	nsIURL* url = nsnull;
+	nsINetService * pNetService;
+	rv = nsServiceManager::GetService(kNetServiceCID, nsINetService::GetIID(), (nsISupports **)&pNetService);
+	if (NS_SUCCEEDED(rv) && pNetService) {
+		rv = pNetService->CreateURL(&url, aUrl);
+		NS_RELEASE(pNetService);
+		if (NS_FAILED(rv))
+			goto done;
 	}
+	else
+		goto done;
 
+	nsIWebShellWindow* newWindow;
 	controllerCID = "6B75BB61-BD41-11d2-9D31-00805F8ADDDF";
 	appShell->CreateTopLevelWindow(nsnull,      // parent
                                    url,

mailnews/compose/src/nsMsgCompose.cpp

@@ -102,6 +102,7 @@ HJ26763
 extern int MK_MSG_ENTER_NAME_FOR_TEMPLATE;
 extern int MK_MSG_INVALID_NEWS_HEADER;
 extern int MK_MSG_INVALID_FOLLOWUP_TO_HEADER;
+extern int MK_MSG_OUTBOX_L10N_NAME_OLD;
 
 #include "xp_help.h"
 }

mailnews/compose/src/nsMsgSendPart.cpp

@@ -698,7 +698,7 @@ int nsMsgSendPart::Write()
 			NS_ASSERTION(MIME_BUFFER_SIZE > 1000, "buffer size out of range"); /* SMTP (RFC821) limit */
 
 			while (1) {
-				char *line = XP_FileReadLine(buffer, MIME_BUFFER_SIZE-3, file);
+				char *line = /*JFD XP_FileReadLine(buffer, MIME_BUFFER_SIZE-3, file)*/ NULL;
 				if (!line)
 					break;  /* EOF */
 

mailnews/compose/src/nsSmtpProtocol.cpp

@@ -33,7 +33,8 @@
 
 #include "rosetta.h"
 
-#include "allxpstr.h"
+//#include "allxpstr.h" // already included into msgcompglue.cpp, cannot include it twice
+						// else we get a lot of link warnings
 #include "prtime.h"
 #include "prlog.h"
 #include "prerror.h"
@@ -44,6 +45,20 @@
 static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID);
 static NS_DEFINE_CID(kRFC822ParserCID, NS_MSGRFC822PARSER_CID);
 
+extern "C" {
+	extern int MK_OUT_OF_MEMORY;
+	extern int MK_SMTP_SERVER_ERROR;
+	extern int MK_TCP_READ_ERROR;
+	extern int MK_COULD_NOT_LOGIN_TO_SMTP_SERVER;
+	extern int MK_COULD_NOT_GET_USERS_MAIL_ADDRESS;
+	extern int MK_POP3_PASSWORD_UNDEFINED;
+	extern int MK_ERROR_SENDING_FROM_COMMAND;
+	extern int MK_ERROR_SENDING_RCPT_COMMAND;
+	extern int MK_ERROR_SENDING_DATA_COMMAND;
+	extern int MK_ERROR_SENDING_MESSAGE;
+	extern int MK_MIME_NO_RECIPIENTS;
+}
+
 /* the output_buffer_size must be larger than the largest possible line
  * 2000 seems good for news
  *