Changeset 114

Timestamp:

10/28/07 23:43:05 (1 year ago)

Author:

daboo

Message:

Keychain support.

Location:

Mulberry/branches/v4.1d1/Sources_Common

Files:

• Mail/Control/CMailControl.cp (modified) (2 diffs)
• Mail/Control/CPasswordManager.cp (added)
• Mail/Control/CPasswordManager.h (added)
• Mail/INET_Clients/LDAP/CLDAPClient.cp (modified) (2 diffs)
• Mail/Protocols/CINETProtocol.cp (modified) (2 diffs)
• Plugins/General/CPluginManager.cp (modified) (1 diff)

Mulberry/branches/v4.1d1/Sources_Common/Mail/Control/CMailControl.cp

@@ -50 +50 @@
 #include "CMulberryCommon.h"
 #include "CNewMailTask.h"
+#include "CPasswordManager.h"
 #include "CPreferences.h"
 #if __dest_os == __mac_os || __dest_os == __mac_os_x
@@ -876 +877 @@
         {
                 auth->SetPswd(CINETProtocol::GetCachedPswd(auth->GetUID()));
+                return true;
+        }
+
+        // Try password manager
+        cdstring savedpswd;
+        if (first_save_user && CPasswordManager::GetManager()->GetPassword(acct, savedpswd))
+        {
+                auth->SetPswd(savedpswd);
+                return true;
         }
         else

Mulberry/branches/v4.1d1/Sources_Common/Mail/INET_Clients/LDAP/CLDAPClient.cp

@@ -26 +26 @@
 #include "CMailControl.h"
 #include "CMulberryApp.h"
+#include "CPasswordManager.h"
 #include "CStatusWindow.h"
 #include "CStringUtils.h"
@@ -443 +444 @@
                         // Only bother if it contains something
                         if (!auth->GetPswd().empty())
+                        {
                                 CINETProtocol::SetCachedPswd(auth->GetUID(), auth->GetPswd());
+                                CPasswordManager::GetManager()->AddPassword(GetAccount(), auth->GetPswd());
+                        }
                 }
 

Mulberry/branches/v4.1d1/Sources_Common/Mail/Protocols/CINETProtocol.cp

@@ -28 +28 @@
 #include "CMailControl.h"
 #include "CMulberryApp.h"
+#include "CPasswordManager.h"
 #include "CPreferences.h"
 #include "CURL.h"
@@ -432 +433 @@
                         // Only bother if it contains something
                         if (!auth->GetPswd().empty())
+                        {
                                 CINETProtocol::SetCachedPswd(auth->GetUID(), auth->GetPswd());
+                                CPasswordManager::GetManager()->AddPassword(GetAccount(), auth->GetPswd());
+                        }
                 }
 

Mulberry/branches/v4.1d1/Sources_Common/Plugins/General/CPluginManager.cp

@@ -208 +208 @@
                                         break;
                                 case CPlugin::ePluginSpelling:
-                                        // Only allow Spellex plugin with this version
-                                        if (!HasSpelling() && actual_plugin->GetName().compare_start("Spellex"))
+                                        // Only allow CocoaSpeller plugin with this version
+                                        if (!HasSpelling() && actual_plugin->GetName().compare_start("CocoaSpeller"))
                                                 mSpellingPlugin = static_cast<CSpellPlugin*>(actual_plugin);
                                         break;