Renegerate this with an older xpidl version, so it compiles on xr1.9 beta release

svn path=/trunk/; revision=8138

1 files changed, 18 insertions, 20 deletions

diff --git a/embed/mozilla/ephyIAddCertExceptionParams.h b/embed/mozilla/ephyIAddCertExceptionParams.h
index a2a93bbfb..1d4d24d7e 100644
--- a/embed/mozilla/ephyIAddCertExceptionParams.h
+++ b/embed/mozilla/ephyIAddCertExceptionParams.h
@@ -22,45 +22,43 @@
   {0x2bac2eb2, 0xcd10, 0x4e3f, \
     { 0x80, 0x2e, 0xda, 0xde, 0x80, 0x96, 0xd6, 0xc5 }}
 
-class NS_NO_VTABLE NS_SCRIPTABLE ephyIAddCertExceptionParams : public nsISupports {
+class NS_NO_VTABLE ephyIAddCertExceptionParams : public nsISupports {
  public: 
 
-  NS_DECLARE_STATIC_IID_ACCESSOR(EPHYIADDCERTEXCEPTIONPARAMS_IID)
+  NS_DEFINE_STATIC_IID_ACCESSOR(EPHYIADDCERTEXCEPTIONPARAMS_IID)
 
   /* readonly attribute boolean prefetchCert; */
-  NS_SCRIPTABLE NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) = 0;
+  NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) = 0;
 
   /* readonly attribute AString location; */
-  NS_SCRIPTABLE NS_IMETHOD GetLocation(nsAString & aLocation) = 0;
+  NS_IMETHOD GetLocation(nsAString & aLocation) = 0;
 
   /* attribute boolean exceptionAdded; */
-  NS_SCRIPTABLE NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) = 0;
-  NS_SCRIPTABLE NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) = 0;
+  NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) = 0;
+  NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) = 0;
 
 };
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(ephyIAddCertExceptionParams, EPHYIADDCERTEXCEPTIONPARAMS_IID)
-
 /* Use this macro when declaring classes that implement this interface. */
 #define NS_DECL_EPHYIADDCERTEXCEPTIONPARAMS \
-  NS_SCRIPTABLE NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert); \
-  NS_SCRIPTABLE NS_IMETHOD GetLocation(nsAString & aLocation); \
-  NS_SCRIPTABLE NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded); \
-  NS_SCRIPTABLE NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded); 
+  NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert); \
+  NS_IMETHOD GetLocation(nsAString & aLocation); \
+  NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded); \
+  NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded); 
 
 /* Use this macro to declare functions that forward the behavior of this interface to another object. */
 #define NS_FORWARD_EPHYIADDCERTEXCEPTIONPARAMS(_to) \
-  NS_SCRIPTABLE NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) { return _to GetPrefetchCert(aPrefetchCert); } \
-  NS_SCRIPTABLE NS_IMETHOD GetLocation(nsAString & aLocation) { return _to GetLocation(aLocation); } \
-  NS_SCRIPTABLE NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) { return _to GetExceptionAdded(aExceptionAdded); } \
-  NS_SCRIPTABLE NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) { return _to SetExceptionAdded(aExceptionAdded); } 
+  NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) { return _to GetPrefetchCert(aPrefetchCert); } \
+  NS_IMETHOD GetLocation(nsAString & aLocation) { return _to GetLocation(aLocation); } \
+  NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) { return _to GetExceptionAdded(aExceptionAdded); } \
+  NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) { return _to SetExceptionAdded(aExceptionAdded); } 
 
 /* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
 #define NS_FORWARD_SAFE_EPHYIADDCERTEXCEPTIONPARAMS(_to) \
-  NS_SCRIPTABLE NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPrefetchCert(aPrefetchCert); } \
-  NS_SCRIPTABLE NS_IMETHOD GetLocation(nsAString & aLocation) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetLocation(aLocation); } \
-  NS_SCRIPTABLE NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetExceptionAdded(aExceptionAdded); } \
-  NS_SCRIPTABLE NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) { return !_to ? NS_ERROR_NULL_POINTER : _to->SetExceptionAdded(aExceptionAdded); } 
+  NS_IMETHOD GetPrefetchCert(PRBool *aPrefetchCert) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPrefetchCert(aPrefetchCert); } \
+  NS_IMETHOD GetLocation(nsAString & aLocation) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetLocation(aLocation); } \
+  NS_IMETHOD GetExceptionAdded(PRBool *aExceptionAdded) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetExceptionAdded(aExceptionAdded); } \
+  NS_IMETHOD SetExceptionAdded(PRBool aExceptionAdded) { return !_to ? NS_ERROR_NULL_POINTER : _to->SetExceptionAdded(aExceptionAdded); } 
 
 #if 0
 /* Use the code below as a template for the implementation class for this interface. */