add booleans to decide if we should attach signatures/vcards

mailnews/base/public/nsIMsgIdentity.h

@@ -24,10 +24,7 @@
 
 class nsIMsgIdentity : public nsISupports {
  public: 
-  static const nsIID& GetIID() {
-    static nsIID iid = NS_IMSGIDENTITY_IID;
-    return iid;
-  }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMSGIDENTITY_IID)
 
   /* attribute string key; */
   NS_IMETHOD GetKey(char * *aKey) = 0;
@@ -57,6 +54,14 @@ class nsIMsgIdentity : public nsISupports {
   NS_IMETHOD GetUseHtml(PRBool *aUseHtml) = 0;
   NS_IMETHOD SetUseHtml(PRBool aUseHtml) = 0;
 
+  /* attribute boolean attachSignature; */
+  NS_IMETHOD GetAttachSignature(PRBool *aAttachSignature) = 0;
+  NS_IMETHOD SetAttachSignature(PRBool aAttachSignature) = 0;
+
+  /* attribute boolean attachVCard; */
+  NS_IMETHOD GetAttachVCard(PRBool *aAttachVCard) = 0;
+  NS_IMETHOD SetAttachVCard(PRBool aAttachVCard) = 0;
+
   /* attribute nsIMsgSignature signature; */
   NS_IMETHOD GetSignature(nsIMsgSignature * *aSignature) = 0;
   NS_IMETHOD SetSignature(nsIMsgSignature * aSignature) = 0;

mailnews/base/public/nsIMsgIdentity.idl

@@ -31,6 +31,8 @@ interface nsIMsgIdentity : nsISupports {
   attribute string replyTo;
   attribute string organization;
   attribute boolean useHtml;
+  attribute boolean attachSignature;
+  attribute boolean attachVCard;
   attribute nsIMsgSignature signature;
   attribute nsIMsgVCard vCard;
   attribute string smtpHostname;

mailnews/base/util/nsMsgIdentity.cpp

@@ -130,4 +130,5 @@ NS_IMPL_IDPREF_STR(Organization, "organization");
 NS_IMPL_IDPREF_BOOL(UseHtml, "send_html");
 NS_IMPL_IDPREF_STR(SmtpHostname, "smtp_server");
 NS_IMPL_IDPREF_STR(SmtpUsername, "smtp_name");
-
+NS_IMPL_IDPREF_BOOL(AttachVCard, "attach_vcard");
+NS_IMPL_IDPREF_BOOL(AttachSignature, "attach_signature");

mailnews/base/util/nsMsgIdentity.h

@@ -62,6 +62,10 @@ public:
   NS_IMETHOD GetUseHtml(PRBool *aUseHtml);
   NS_IMETHOD SetUseHtml(PRBool aUseHtml);
 
+  /* attribute boolean attachSignature */
+  NS_IMETHOD GetAttachSignature(PRBool *aAttachSignature);
+  NS_IMETHOD SetAttachSignature(PRBool aAttachSignature);
+
   /* attribute nsIMsgSignature signature; */
   NS_IMETHOD GetSignature(nsIMsgSignature * *aSignature);
   NS_IMETHOD SetSignature(nsIMsgSignature * aSignature);
@@ -69,6 +73,10 @@ public:
   /* attribute nsIMsgVCard vCard; */
   NS_IMETHOD GetVCard(nsIMsgVCard * *aVCard);
   NS_IMETHOD SetVCard(nsIMsgVCard * aVCard);
+  
+  /* attribute attachVCard; */
+  NS_IMETHOD GetAttachVCard(PRBool *attachVCard);
+  NS_IMETHOD SetAttachVCard(PRBool attachVCard);
 
   /* attribute string smtpHostname; */
   NS_IMETHOD GetSmtpHostname(char * *aSmtpHostname);