Changeset 86 for Mulberry/branches/v4.1d1/Sources_Common/Application/Preferences/CIdentity.cp

Timestamp:

07/09/07 10:02:18 (2 years ago)

Author:

daboo

Message:

Some 4.1 changes. Mostly vCard/CardDAV and CalDAV scheduling support.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Application/Preferences/CIdentity.cp (modified) (8 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Application/Preferences/CIdentity.cp

@@ -23 +23 @@
 
 #include "char_stream.h"
+#include "CCalendarAddress.h"
 #include "CCalendarStoreNode.h"
 #include "CMbox.h"
@@ -48 +49 @@
         mReplyTo.second = false;
         mSender.second = false;
+        mCalendar.second = false;
         mCopyTo.second = false;
         mCopyToNone = false;
@@ -77 +79 @@
         mReplyTo = copy.mReplyTo;
         mSender = copy.mSender;
+        mCalendar = copy.mCalendar;
         mCopyTo = copy.mCopyTo;
         mCopyToNone = copy.mCopyToNone;
@@ -111 +114 @@
                         (mFrom == test.mFrom) &&
                         (mReplyTo == test.mReplyTo) &&
-                        (mSender== test.mSender) &&
+                        (mSender == test.mSender) &&
+                        (mCalendar == test.mCalendar) &&
                         (mCopyTo == test.mCopyTo) &&
                         (mCopyToNone == test.mCopyToNone) &&
@@ -388 +392 @@
         }
 
+        if (::VersionTest(vers_prefs, VERS_4_1_0_A_1) >= 0)
+        {
+                MakePair(txt, mCalendar);
+        }       
+        
         // Expansion items:
         
@@ -487 +496 @@
         item.ConvertFromOS();
         all += item;
+
+        AddPair(all, mCalendar);
+        all += cSpace;
 
         all += mFuture.GetInfo();
@@ -602 +614 @@
         else
                 return mSender.first;
+}
+
+const cdstring& CIdentity::GetCalendar(bool resolve) const
+{
+        if (resolve)
+                return GetInheritedValue(&CIdentity::GetCalendar, &CIdentity::UseCalendar);
+        else
+                return mCalendar.first;
+}
+
+cdstring CIdentity::GetCalendarAddress() const
+{
+        cdstring result = GetCalendar(true);
+        if (!result.empty())
+                return result;
+        result = GetFrom(true);
+        if (!result.empty())
+        {
+                CAddress addr(result);
+                result = addr.GetName();
+                if (!result.empty())
+                        result += " ";
+                result += "<";
+                result += addr.GetMailAddress();
+                result += ">";
+        }
+        return result;
 }
 
@@ -872 +911 @@
         
         return NULL;
+        }
+        
+CIdentity* CIdentityList::GetIdentity(const CCalendarAddress& caladdr) const
+{
+        // Match the Calendar address first
+        const cdstring& comp = caladdr.GetAddress();
+        for(const_iterator iter = begin(); iter != end(); iter++)
+        {
+                cdstring test((*iter).GetCalendar(true));
+                CCalendarAddress testc(test);
+                if (testc.GetAddress().compare(comp, true) == 0)
+                        return const_cast<CIdentity*>(&(*iter));
+        }
+        
+        // If calendar address is mailto, try to match a From address
+        if (comp.compare_start(cMailtoURLScheme))
+        {
+                cdstring temp(comp, ::strlen(cMailtoURLScheme));
+                CAddress addr(temp, caladdr.GetName());
+                return GetIdentity(addr);
+        }
+        return NULL;
 }