From c5d39ec23ec24baa6ea9bd936692fa7df4a45795 Mon Sep 17 00:00:00 2001
From: "daniel.boelzle%sun.com"
 <daniel.boelzle%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 7 May 2008 19:34:59 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20377761=20=C3=A2=C2=80=C2=93=20Outlook=202?=
 =?UTF-8?q?00x=20does=20not=20recognize=20iTIP/iMIP=20invitation=20because?=
 =?UTF-8?q?=20of=20MIME=20type=20issues;=20r=3Dctalbert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@251344 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/base/src/calUtils.js                          | 2 +-
 mozilla/calendar/itip/calItipEmailTransport.js                 | 2 ++
 .../locales/en-US/chrome/lightning/lightning.properties        | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mozilla/calendar/base/src/calUtils.js b/mozilla/calendar/base/src/calUtils.js
index 0a99c2db7d1..7b6e36e63bf 100644
--- a/mozilla/calendar/base/src/calUtils.js
+++ b/mozilla/calendar/base/src/calUtils.js
@@ -2262,7 +2262,7 @@ function sendItipInvitation(aItem, aTypeOfInvitation, aRecipientsList) {
 
     if (aRecipientsList.length == 0) {
         // Fix up our attendees for invitations using some good defaults
-        var itemAtt = item.getAttendees({}); // reuse cloned attendees
+        var itemAtt = item.getAttendees({});
         item.removeAllAttendees();
         for each (var attendee in itemAtt) {
             attendee = attendee.clone();
diff --git a/mozilla/calendar/itip/calItipEmailTransport.js b/mozilla/calendar/itip/calItipEmailTransport.js
index a84ef92aab1..8297cefe679 100644
--- a/mozilla/calendar/itip/calItipEmailTransport.js
+++ b/mozilla/calendar/itip/calItipEmailTransport.js
@@ -220,6 +220,7 @@ calItipEmailTransport.prototype = {
                 // To somehow have a last resort before sending spam, the user can choose to send the mail.
                 // XXX todo: We should consider a more sophisticated dialiog,
                 //           so the user could choose the account for sending.
+                // i.e. bug 432660
                 var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                                               .getService(Components.interfaces.nsIPromptService);
                 var prefCompatMode = getPrefSafe("calendar.itip.compatSendMode", 0);
@@ -268,6 +269,7 @@ calItipEmailTransport.prototype = {
                     // xxx todo: add send/progress UI, maybe recycle
                     //           "@mozilla.org/messengercompose/composesendlistener;1"
                     //           and/or "chrome://messenger/content/messengercompose/sendProgress.xul"
+                    // i.e. bug 432662
                     var msgSend = Components.classes["@mozilla.org/messengercompose/send;1"]
                                             .createInstance(Components.interfaces.nsIMsgSend);
                     msgSend.sendMessageFile(this.mDefaultIdentity,
diff --git a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
index f8bb83cd7d2..238a89b163b 100644
--- a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
+++ b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
@@ -70,6 +70,9 @@ imipCancelInvitation.label=Delete
 imipDeclineInvitation.label=Decline
 imipUpdateInvitation.label=Update
 imipAcceptTentativeInvitation.label=Tentative
+imipSendMailTitle=Notify Attendees
+imipSendMail=Would you like to send out notification E-Mails now?
+imipSendMailOutlook2000CompatMode=Support Outlook 2000 and Outlook 2002.
 
 itipReplySubject=Event Invitation Reply: %1$S
 itipReplyBodyAccept=%1$S has accepted your event invitation.