Changeset 150 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/Preferences_Dialog/CPrefsAccount.cp
- Timestamp:
- 01/13/08 21:39:50 (11 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
Mulberry/branches/v4.1d1/MacOS/Sources/Application/Preferences_Dialog/CPrefsAccount.cp
r97 r150 268 268 269 269 // Add each remote account 270 for(C INETAccountList::const_iterator iter = mCopyPrefs->mRemoteAccounts.GetValue().begin();270 for(COptionsAccountList::const_iterator iter = mCopyPrefs->mRemoteAccounts.GetValue().begin(); 271 271 iter != mCopyPrefs->mRemoteAccounts.GetValue().end(); iter++, menu_pos++) 272 272 ::AppendItemToMenu(menuH, menu_pos, (*iter)->GetName(), false, cicn_RemoteAccount); … … 359 359 break; 360 360 361 case menu_AccountWebDAVOptions: 361 362 case menu_AccountIMSPOptions: 362 363 case menu_AccountACAPOptions: … … 431 432 break; 432 433 434 case menu_AccountWebDAVOptions: 433 435 case menu_AccountIMSPOptions: 434 436 case menu_AccountACAPOptions: 435 acct = new C INETAccount;437 acct = new COptionsAccount; 436 438 switch(acct_type) 437 439 { 440 case menu_AccountWebDAVOptions: 441 acct->SetServerType(CINETAccount::eWebDAVPrefs); 442 break; 438 443 case menu_AccountIMSPOptions: 439 444 acct->SetServerType(CINETAccount::eIMSP); … … 605 610 else if (typeid(*acct) == typeid(CSMTPAccount)) 606 611 acct_list = (CINETAccountList*) &mCopyPrefs->mSMTPAccounts.GetValue(); 607 else if (typeid(*acct) == typeid(C INETAccount))612 else if (typeid(*acct) == typeid(COptionsAccount)) 608 613 acct_list = (CINETAccountList*) &mCopyPrefs->mRemoteAccounts.GetValue(); 609 614 else if (typeid(*acct) == typeid(CAddressAccount)) … … 640 645 else if (typeid(*acct) == typeid(CSMTPAccount)) 641 646 mCopyPrefs->mSMTPAccounts.SetDirty(); 642 else if (typeid(*acct) == typeid(C INETAccount))647 else if (typeid(*acct) == typeid(COptionsAccount)) 643 648 mCopyPrefs->mRemoteAccounts.SetDirty(); 644 649 else if (typeid(*acct) == typeid(CAddressAccount)) … … 696 701 else if (typeid(*acct) == typeid(CSMTPAccount)) 697 702 mCopyPrefs->mSMTPAccounts.SetDirty(); 698 else if (typeid(*acct) == typeid(C INETAccount))703 else if (typeid(*acct) == typeid(COptionsAccount)) 699 704 { 700 705 // Prevent delete of last remote account if set to remote … … 818 823 mIsSMTP = true; 819 824 } 820 else if (typeid(*account) == typeid(C INETAccount))825 else if (typeid(*account) == typeid(COptionsAccount)) 821 826 { 822 827 switch(account->GetServerType()) 823 828 { 829 case CINETAccount::eWebDAVPrefs: 830 copyStr.FromResource("UI::Preferences::AccountWebDAVOptions"); 831 break; 824 832 case CINETAccount::eIMSP: 825 833 copyStr.FromResource("UI::Preferences::AccountIMSPOptions"); … … 912 920 else if (typeid(*current) == typeid(CSMTPAccount)) 913 921 account = new CSMTPAccount(*(CSMTPAccount*) current); 914 else if (typeid(*current) == typeid(C INETAccount))915 account = new C INETAccount(*(CINETAccount*) current);922 else if (typeid(*current) == typeid(COptionsAccount)) 923 account = new COptionsAccount(*(COptionsAccount*) current); 916 924 else if (typeid(*current) == typeid(CAddressAccount)) 917 925 account = new CAddressAccount(*(CAddressAccount*) current); … … 940 948 else if (typeid(*current) == typeid(CSMTPAccount)) 941 949 same = (*((CSMTPAccount*) current) == *((CSMTPAccount*) account)); 942 else if (typeid(*current) == typeid(C INETAccount))943 same = (*((C INETAccount*) current) == *((CINETAccount*) account));950 else if (typeid(*current) == typeid(COptionsAccount)) 951 same = (*((COptionsAccount*) current) == *((COptionsAccount*) account)); 944 952 else if (typeid(*current) == typeid(CAddressAccount)) 945 953 same = (*((CAddressAccount*) current) == *((CAddressAccount*) account)); … … 956 964 else if (typeid(*account) == typeid(CSMTPAccount)) 957 965 mCopyPrefs->mSMTPAccounts.SetDirty(); 958 else if (typeid(*account) == typeid(C INETAccount))966 else if (typeid(*account) == typeid(COptionsAccount)) 959 967 mCopyPrefs->mRemoteAccounts.SetDirty(); 960 968 else if (typeid(*account) == typeid(CAddressAccount)) … … 1064 1072 else if (typeid(*account) == typeid(CSMTPAccount)) 1065 1073 panel = paneid_PrefsSMTPAccount; 1066 else if (typeid(*account) == typeid(C INETAccount))1074 else if (typeid(*account) == typeid(COptionsAccount)) 1067 1075 panel = paneid_PrefsRemoteAccount; 1068 1076 else if (typeid(*account) == typeid(CAddressAccount))