Bug 812212 - SeaMonkey trunk fails to compile (nsIPop3Service.idl), r=mcsmurf AURORA_BASE_20121119
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 19 Nov 2012 22:26:28 +0100
changeset 11587 ca6c314f4fef6a6ee928b72a8f8deb5e2791484e
parent 11586 2e2fb5a707781397a709b3419a2544cf43559e68
child 11588 dbf91f35f60a1fa0194c7b426162ad63f181b21c
push id8635
push usermcsmurf@mcsmurf.de
push dateMon, 19 Nov 2012 21:26:49 +0000
treeherdercomm-central@ca6c314f4fef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcsmurf
bugs812212
Bug 812212 - SeaMonkey trunk fails to compile (nsIPop3Service.idl), r=mcsmurf
mailnews/import/public/nsIImportService.idl
mailnews/import/src/nsImportService.cpp
mailnews/local/public/nsIMovemailService.idl
--- a/mailnews/import/public/nsIImportService.idl
+++ b/mailnews/import/public/nsIImportService.idl
@@ -5,27 +5,29 @@
 
 /*
 
   The import service.
 
  */
 
 #include "nsISupports.idl"
-#include "nsIMsgSend.idl"
 
 interface nsIImportModule;
 interface nsIImportMailboxDescriptor;
 interface nsIImportABDescriptor;
 interface nsIImportGeneric;
 interface nsIImportFieldMap;
 interface nsIMsgSendListener;
 interface nsIMsgCompFields;
 interface nsIMsgSendListener;
 interface nsIArray;
+interface nsIMsgIdentity;
+interface nsIMsgCompFields;
+interface nsISupportsArray;
 
 [scriptable, uuid(376fc4c2-76d3-4b47-8095-406260cb9b1f)]
 interface nsIImportService : nsISupports
 {
     void DiscoverModules();
 
   long GetModuleCount( in string filter);
   void GetModuleInfo( in string filter, in long index, out wstring name, out wstring description);
--- a/mailnews/import/src/nsImportService.cpp
+++ b/mailnews/import/src/nsImportService.cpp
@@ -34,16 +34,17 @@
 #include "ImportDebug.h"
 #include "nsImportService.h"
 #include "nsImportStringBundle.h"
 #include "nsCRTGlue.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 #include "nsISupportsArray.h"
+#include "nsIMsgSend.h"
 
 PRLogModuleInfo *IMPORTLOGMODULE = nullptr;
 
 static nsIImportService *  gImportService = nullptr;
 static const char *  kWhitespace = "\b\t\r\n ";
 
 
 ////////////////////////////////////////////////////////////////////////
--- a/mailnews/local/public/nsIMovemailService.idl
+++ b/mailnews/local/public/nsIMovemailService.idl
@@ -1,17 +1,20 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIUrlListener.idl"
-#include "nsIMovemailIncomingServer.idl"
-#include "nsIMsgFolder.idl"
+
+interface nsIMsgWindow;
+interface nsIMsgFolder;
+interface nsIMovemailIncomingServer;
+interface nsIUrlListener;
+interface nsIURI;
 
 [scriptable, uuid(4c7786a4-1dd2-11b2-9fbe-c59d742de59b)]
 interface nsIMovemailService : nsISupports {
 
     nsIURI GetNewMail(in nsIMsgWindow aMsgWindow,
                       in nsIUrlListener aUrlListener,
                       in nsIMsgFolder aMsgFolder,
                       in nsIMovemailIncomingServer movemailServer);