Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Here are two minor bug fixes #1

Open
wants to merge 39 commits into
base: 20fe6157e90ffe63448e718d5d3d8ba8a4e23a51
Choose a base branch
from
Open

Here are two minor bug fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0967787
Fix up XCode projects a bit.
mtalexander Dec 13, 2011
4d3ad28
Change the build products location for plug-ins to ../../MacOS/build
mtalexander Dec 13, 2011
1036bc5
Changes to keep XCode from asking me to upgrade the projects.
mtalexander Dec 17, 2011
836ced4
Turn off the XCode upgrade warnings in the PluginLibraries project.
mtalexander Dec 17, 2011
652bc72
Fix line endings.
mtalexander Dec 11, 2011
0c25440
Update CICalender with line ending changes
mtalexander Dec 11, 2011
12913f9
Update submodules.
mtalexander Dec 20, 2011
f019b6e
The IsEmpty() method on CBlockOptionsMap is backwards.
mtalexander Feb 28, 2012
c2a6fe2
Get authentication credentials before the first WEBDAV transaction.
mtalexander Mar 1, 2012
aaeb79c
Sort some files alphabetically in the GUI
mtalexander Mar 1, 2012
7728013
The IsEmpty() method on CBlockOptionsMap is backwards.
mtalexander Feb 28, 2012
3020244
Get authentication credentials before the first WEBDAV transaction.
mtalexander Mar 1, 2012
56a1b09
Merge branch 'master' into working
mtalexander Mar 1, 2012
f1ccaed
add -Wno-logical-op-parentheses to plugins project to avoid a && B ||…
mtalexander Mar 7, 2012
4e616f1
Avoid warnings for unused return value from BIO_flush and BIO_reset
mtalexander Mar 7, 2012
3e4f1df
Add Win32 VC10 project files. Ignore Win32 build output directories a…
SpareSimian May 6, 2012
f39d5c2
Ignore Visual Studio local solution state and precompiled headers dir.
SpareSimian May 7, 2012
41ec274
Use newer Windows header for finding system directories.
SpareSimian May 7, 2012
a67da22
Newer Windows compiler defines most errno constants now.
SpareSimian May 7, 2012
2510dcf
back_inserter requires <iterator>.
SpareSimian May 7, 2012
0ff157b
NULL as template parameter must be cast to real pointer type.
SpareSimian May 7, 2012
cb337fc
Changes to use openssl-1.0. Netscape certificate import currently #if…
SpareSimian May 7, 2012
f3287bf
Move openssl-1.0.0d to vendor subdirectory in preparation for making …
SpareSimian May 7, 2012
cf224e3
High-bit ASCII requires a (char) cast.
SpareSimian May 7, 2012
406d7e5
Iterators invalidated by erase() were being used in CSearchCriteriaCo…
SpareSimian May 14, 2012
eb3287a
Fix initial Win32 window positioning for taskbar at left or top.
SpareSimian May 30, 2012
71029ed
Remove old Win32 RectOnScreen implementation.
SpareSimian May 30, 2012
1d336b0
Code clean-up
Jul 27, 2012
c6726d5
Make sure attendee state icon is shown properly.
Jul 27, 2012
6a0f9bd
Separator widget not needed.
Jul 27, 2012
1140175
Minor fixes. (svn #456)
Jul 27, 2012
9d763e4
Improve the application and URL launching on OS X. (svn #457)
Jul 27, 2012
4fa5aef
Calendar display name tweaks. (svn #458)
Jul 27, 2012
e46db23
Fixing some sync report issues. (svn #459)
Jul 27, 2012
443bcb5
Version/year bump. (svn #460)
Jul 27, 2012
42e5285
Debian package version bump.
mbert Jul 27, 2012
ca7eea0
Merge branch 'XCode4' into working
mtalexander Sep 1, 2012
3f6438e
Merge branch 'master' into working
mtalexander Sep 1, 2012
fa6d96c
New versions of XMLlib and CICalendar
mtalexander Sep 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,57 @@ Plug-ins/SSL/SSL.xcodeproj/xcuserdata/
Plug-ins/SSL/build/
Plug-ins/vCardAdbkIO/build/
Plug-ins/vCardAdbkIO/vCardAdbkIO.xcodeproj/xcuserdata/
Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj.user
Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj.user
Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj.user
Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj.user
Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj.user
Plug-ins/GPG/GPG.vcxproj.user
Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj.user
Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj.user
Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj.user
Plug-ins/PluginLibrary/PluginLib.vcxproj.user
Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj.user
Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj.user
Plug-ins/SMIME/SMIME.vcxproj.user
Plug-ins/SSL/SSL.vcxproj.user
Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj.user
Win32/Mulberry.vcxproj.user
Plug-ins/CommunicatorAdbkIO/Debug
Plug-ins/CRAM-MD5/Debug
Plug-ins/DIGEST-MD5/Debug
Plug-ins/Eudora4AdbkIO/Debug
Plug-ins/EudoraAdbkIO/Debug
Plug-ins/GPG/Debug
Plug-ins/NetscapeAdbkIO/Debug
Plug-ins/OEAdbkIO/Debug
Plug-ins/PineAdbkIO/Debug
Plug-ins/PluginLibrary/Debug
Plug-ins/QuickmailAdbkIO/Debug
Plug-ins/QuickmailProAdbkIO/Debug
Plug-ins/SMIME/Debug
Plug-ins/SSL/Debug
Plug-ins/vCardAdbkIO/Debug
Win32/Debug
Win32/Installer/Mulberry/Debug
Plug-ins/CommunicatorAdbkIO/Release
Plug-ins/CRAM-MD5/Release
Plug-ins/DIGEST-MD5/Release
Plug-ins/Eudora4AdbkIO/Release
Plug-ins/EudoraAdbkIO/Release
Plug-ins/GPG/Release
Plug-ins/NetscapeAdbkIO/Release
Plug-ins/OEAdbkIO/Release
Plug-ins/PineAdbkIO/Release
Plug-ins/PluginLibrary/Release
Plug-ins/QuickmailAdbkIO/Release
Plug-ins/QuickmailProAdbkIO/Release
Plug-ins/SMIME/Release
Plug-ins/SSL/Release
Plug-ins/vCardAdbkIO/Release
Win32/Release
Win32/Installer/Mulberry/Release
Win32/MulberryVC10.sdf
Win32/MulberryVC10.suo
Win32/MulberryVC10.opensdf
Win32/ipch/
2 changes: 1 addition & 1 deletion Libraries/CICalendar
Open in desktop
Submodule CICalendar updated 6 files
+10 −0 .gitattributes
+18 −0 Source/CICalendar.cpp
+1 −0 Source/CICalendar.h
+22 −22 Source/CICalendarInit.cpp
+3 −1 Source/CITIPProcessor.cpp
+1 −0 Source/CITIPProcessor.h
2 changes: 1 addition & 1 deletion Libraries/JX
Open in desktop
Submodule JX updated 195 files
2 changes: 1 addition & 1 deletion Libraries/XMLLib
Open in desktop
Submodule XMLLib updated 2 files
+69 −4 Source/XMLNode.cp
+3 −2 Source/XMLNode.h
244 changes: 122 additions & 122 deletions MacOS/MulberryXcode.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5465,72 +5465,72 @@
20286C2AFDCF999611CA2CEA /* Sources */ = {
isa = PBXGroup;
children = (
32DBCF6D0370B57F00C91783 /* MulberryXcode_Prefix.pch */,
AFCDE4930AE1795600E30447 /* Mulberry_PrefixX.h */,
AFCDD2D10AE1647A00E30447 /* os_dep.h */,
AFCDD2D20AE1647A00E30447 /* os_dep.cp */,
AFCDE48E0AE1788300E30447 /* framework.h */,
AFCDDCA10AE176DA00E30447 /* 3 Pane */,
AFCDDFD00AE176DE00E30447 /* Address */,
AFCDDE8B0AE176DC00E30447 /* Address Book */,
AFCDDE6C0AE176DC00E30447 /* Address Book Manager */,
AFCDDE820AE176DC00E30447 /* Address Search */,
AFCDDEB70AE176DD00E30447 /* App Support */,
AFCDDAC80AE1769900E30447 /* Application */,
AFCDDFBD0AE176DE00E30447 /* Attachments */,
AFCDDB2A0AE176D800E30447 /* Automation */,
AFCDDCE80AE176DA00E30447 /* Calendar */,
AFCDE0400AE176DF00E30447 /* Calendar_Store */,
AFCDDFE50AE176DE00E30447 /* CICalendar */,
AFCDDF4E0AE176DD00E30447 /* Control */,
AFCDDB780AE176D900E30447 /* Errors */,
AFCDE09C0AE176DF00E30447 /* Extensions */,
AFCDDFB00AE176DE00E30447 /* Filtering */,
AFCDDE690AE176DC00E30447 /* Find & Replace Window */,
AFCDDB030AE176D800E30447 /* Formatting */,
AFCDE48E0AE1788300E30447 /* framework.h */,
AF2551E70C432843001AAE53 /* HTML */,
AFCDDB2A0AE176D800E30447 /* Automation */,
AFCDE05C0AE176DF00E30447 /* HTTP */,
AFCDE0EB0AE176DF00E30447 /* i18n */,
AFCDE0BA0AE176DF00E30447 /* INET Clients */,
AFCDDE4D0AE176DC00E30447 /* Letter Window */,
AFCDDEB20AE176DD00E30447 /* Macros */,
AFCDDF8D0AE176DE00E30447 /* Mailbox */,
AFCDDDD10AE176DC00E30447 /* Mailbox Info Window */,
AFCDDDC50AE176DB00E30447 /* Mailbox Window */,
AFCDDF9A0AE176DE00E30447 /* Message */,
AFCDDE320AE176DC00E30447 /* Message Window */,
AFCDE1210AE176E000E30447 /* MIME Filters */,
AF37509E0AE1DC5D00C56E20 /* More ATSUI */,
AFCDDA760AE173C700E30447 /* MoreFiles */,
AFCDDA9B0AE1751700E30447 /* MoreFilesX */,
AFCDE4930AE1795600E30447 /* Mulberry_PrefixX.h */,
32DBCF6D0370B57F00C91783 /* MulberryXcode_Prefix.pch */,
AFCDE0B10AE176DF00E30447 /* Network */,
AFCDE0DE0AE176DF00E30447 /* Offline Clients */,
AFCDDF710AE176DE00E30447 /* Offline Mail */,
AFCDDF7C0AE176DE00E30447 /* Offline Recording */,
AFCDD2D20AE1647A00E30447 /* os_dep.cp */,
AFCDD2D10AE1647A00E30447 /* os_dep.h */,
AFCDDB2F0AE176D800E30447 /* Plug-ins */,
AFCDDB750AE176D900E30447 /* Speech */,
AFCDDB780AE176D900E30447 /* Errors */,
AFCDD2E00AE164ED00E30447 /* PowerPlant */,
AFCDD89C0AE1726900E30447 /* PowerPlantX */,
AFCDE53F0AE1AC4A00E30447 /* PPOverride */,
AFCDDB830AE176D900E30447 /* Preferences */,
AFCDDBD30AE176D900E30447 /* Preferences Dialog */,
AFCDDC970AE176DA00E30447 /* Status */,
AFCDDCA10AE176DA00E30447 /* 3 Pane */,
AFCDDCE80AE176DA00E30447 /* Calendar */,
AFBE2AB30D2F3089002132BE /* Preferences_Store */,
AFCDDF630AE176DD00E30447 /* Protocols */,
AFCDDE0D0AE176DC00E30447 /* Rules Window */,
AFCDDFA90AE176DE00E30447 /* Search */,
AFCDDDF80AE176DC00E30447 /* Search Window */,
AFCDDD8E0AE176DB00E30447 /* Server Window */,
AFCDDDC50AE176DB00E30447 /* Mailbox Window */,
AFCDDDD10AE176DC00E30447 /* Mailbox Info Window */,
AFCDE0DB0AE176DF00E30447 /* SMTP Client */,
AFCDDDEA0AE176DC00E30447 /* SMTP Window */,
AFCDDDF80AE176DC00E30447 /* Search Window */,
AFCDDE0D0AE176DC00E30447 /* Rules Window */,
AFCDDE320AE176DC00E30447 /* Message Window */,
AFCDDE4D0AE176DC00E30447 /* Letter Window */,
AFCDDE690AE176DC00E30447 /* Find & Replace Window */,
AFCDDE6C0AE176DC00E30447 /* Address Book Manager */,
AFCDDE820AE176DC00E30447 /* Address Search */,
AFCDDE8B0AE176DC00E30447 /* Address Book */,
AFCDDEB20AE176DD00E30447 /* Macros */,
AFCDDEB70AE176DD00E30447 /* App Support */,
AFCDDEF90AE176DD00E30447 /* Text Support */,
AFCDDB750AE176D900E30447 /* Speech */,
AFCDDC970AE176DA00E30447 /* Status */,
AFCDDF1B0AE176DD00E30447 /* Table Support */,
AFCDDEF90AE176DD00E30447 /* Text Support */,
AFCDDF400AE176DD00E30447 /* Toolbars */,
AFCDDF4E0AE176DD00E30447 /* Control */,
AFCDDF630AE176DD00E30447 /* Protocols */,
AFCDDF710AE176DE00E30447 /* Offline Mail */,
AFCDDF7C0AE176DE00E30447 /* Offline Recording */,
AFCDDF8D0AE176DE00E30447 /* Mailbox */,
AFCDDF9A0AE176DE00E30447 /* Message */,
AFCDDFA90AE176DE00E30447 /* Search */,
AFCDDFB00AE176DE00E30447 /* Filtering */,
AFCDDFBD0AE176DE00E30447 /* Attachments */,
AFCDDFD00AE176DE00E30447 /* Address */,
AFCDDFE50AE176DE00E30447 /* CICalendar */,
AFCDE0400AE176DF00E30447 /* Calendar_Store */,
AFCDE1360AE176E000E30447 /* Utils */,
AF2551720C4326EF001AAE53 /* vCard */,
AF25515A0C4326C8001AAE53 /* VCard_Store */,
AFBE2AB30D2F3089002132BE /* Preferences_Store */,
AFCDE05C0AE176DF00E30447 /* HTTP */,
AFCDE09C0AE176DF00E30447 /* Extensions */,
AFCDE0B10AE176DF00E30447 /* Network */,
AFCDE0BA0AE176DF00E30447 /* INET Clients */,
AFCDE0DB0AE176DF00E30447 /* SMTP Client */,
AFCDE0DE0AE176DF00E30447 /* Offline Clients */,
AFCDE0EB0AE176DF00E30447 /* i18n */,
AFCDE1210AE176E000E30447 /* MIME Filters */,
AFCDE1360AE176E000E30447 /* Utils */,
AF82692D0C1B2C3500B18EED /* XMLLib */,
AFCDE1680AE176E000E30447 /* XML Resources */,
AFCDD2E00AE164ED00E30447 /* PowerPlant */,
AFCDD89C0AE1726900E30447 /* PowerPlantX */,
AFCDE53F0AE1AC4A00E30447 /* PPOverride */,
AFCDDA760AE173C700E30447 /* MoreFiles */,
AFCDDA9B0AE1751700E30447 /* MoreFilesX */,
AF37509E0AE1DC5D00C56E20 /* More ATSUI */,
AF82692D0C1B2C3500B18EED /* XMLLib */,
);
name = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -7118,87 +7118,87 @@
AFCDDB830AE176D900E30447 /* Preferences */ = {
isa = PBXGroup;
children = (
AFCDDB840AE176D900E30447 /* CWindowStatesFwd.h */,
AFCDDB850AE176D900E30447 /* CWindowStates.h */,
AFCDDB860AE176D900E30447 /* CWindowStates.cp */,
AFCDDB870AE176D900E30447 /* CWindowStatesXtras.cp */,
AFCDDB880AE176D900E30447 /* CScreenDimensions.h */,
AFCDDB890AE176D900E30447 /* CScreenDimensions.cp */,
AFCDDB8A0AE176D900E30447 /* CPreferenceKeys.h */,
AFCDDB8B0AE176D900E30447 /* CPreferenceKeys.cp */,
AFCDDB8C0AE176D900E30447 /* CAdmin.h */,
AFCDDBA40AE176D900E30447 /* CAddressAccount.cp */,
AFCDDBA30AE176D900E30447 /* CAddressAccount.h */,
AFCDDB8D0AE176D900E30447 /* CAdmin.cp */,
AFCDDB8E0AE176D900E30447 /* CAdminLock.h */,
AFCDDB8C0AE176D900E30447 /* CAdmin.h */,
AFCDDB8F0AE176D900E30447 /* CAdminLock.cp */,
AFCDDB900AE176D900E30447 /* CPreferences.h */,
AFCDDB910AE176D900E30447 /* CPreferences.cp */,
AFCDDB920AE176D900E30447 /* CPreferencesBits.cp */,
AFCDDB930AE176D900E30447 /* CPreferencesXtra.cp */,
AFCDDB940AE176D900E30447 /* CPreferencesRW.cp */,
AFCDDB950AE176D900E30447 /* CPreferenceEnum.h */,
AFCDDB960AE176D900E30447 /* CPreferenceEnum.cp */,
AFCDDB970AE176D900E30447 /* prefsvector.h */,
AFCDDB980AE176D900E30447 /* prefsvector.cp */,
AFCDDB990AE176D900E30447 /* CFutureItems.h */,
AFCDDB9A0AE176D900E30447 /* CFutureItems.cp */,
AFCDDB9B0AE176D900E30447 /* CAuthenticator.h */,
AFCDDB8E0AE176D900E30447 /* CAdminLock.h */,
AFCDDB9C0AE176D900E30447 /* CAuthenticator.cp */,
AFCDDB9D0AE176D900E30447 /* CINETAccount.h */,
AFCDDB9E0AE176D900E30447 /* CINETAccount.cp */,
AFCDDB9F0AE176D900E30447 /* CMailAccount.h */,
AFCDDBA00AE176D900E30447 /* CMailAccount.cp */,
AFCDDBA10AE176D900E30447 /* CSMTPAccount.h */,
AFCDDBA20AE176D900E30447 /* CSMTPAccount.cp */,
AFBE2AB90D2F34A4002132BE /* COptionsAccount.h */,
AFBE2AB80D2F34A4002132BE /* COptionsAccount.cp */,
AFCDDBA30AE176D900E30447 /* CAddressAccount.h */,
AFCDDBA40AE176D900E30447 /* CAddressAccount.cp */,
AFCDDBA50AE176D900E30447 /* CManageSIEVEAccount.h */,
AFCDDBA60AE176D900E30447 /* CManageSIEVEAccount.cp */,
AFCDDBA70AE176D900E30447 /* CCalendarAccount.h */,
AFCDDB9B0AE176D900E30447 /* CAuthenticator.h */,
AFCDDBCA0AE176D900E30447 /* CBlockOptionsMap.cp */,
AFCDDBC90AE176D900E30447 /* CBlockOptionsMap.h */,
AFCDDBA80AE176D900E30447 /* CCalendarAccount.cp */,
AFCDDBA90AE176D900E30447 /* CDisplayItem.h */,
AFCDDBA70AE176D900E30447 /* CCalendarAccount.h */,
AFCDDBC40AE176D900E30447 /* CDayWeekViewTimeRange.cpp */,
AFCDDBC30AE176D900E30447 /* CDayWeekViewTimeRange.h */,
AFCDDBAA0AE176D900E30447 /* CDisplayItem.cp */,
AFCDDBAB0AE176D900E30447 /* CFavouriteItem.h */,
AFCDDBA90AE176D900E30447 /* CDisplayItem.h */,
AFCDDBB60AE176D900E30447 /* CDSN.cp */,
AFCDDBB50AE176D900E30447 /* CDSN.h */,
AFCDDBAC0AE176D900E30447 /* CFavouriteItem.cp */,
AFCDDBAD0AE176D900E30447 /* COSStringMap.h */,
AFCDDBAE0AE176D900E30447 /* COSStringMap.cp */,
AFCDDBAF0AE176D900E30447 /* CNotification.h */,
AFCDDBB00AE176D900E30447 /* CNotification.cp */,
AFCDDBB10AE176D900E30447 /* CMailNotification.h */,
AFCDDBB20AE176D900E30447 /* CMailNotification.cp */,
AFCDDBB30AE176D900E30447 /* CIdentity.h */,
AFCDDBAB0AE176D900E30447 /* CFavouriteItem.h */,
AFCDDBD00AE176D900E30447 /* CFileOptionsMap.cp */,
AFCDDBCF0AE176D900E30447 /* CFileOptionsMap.h */,
AFCDDB9A0AE176D900E30447 /* CFutureItems.cp */,
AFCDDB990AE176D900E30447 /* CFutureItems.h */,
AFCDDBB40AE176D900E30447 /* CIdentity.cp */,
AFCDDBB50AE176D900E30447 /* CDSN.h */,
AFCDDBB60AE176D900E30447 /* CDSN.cp */,
AFCDDBB70AE176D900E30447 /* CSearchStyle.h */,
AFCDDBB80AE176D900E30447 /* CSearchStyle.cp */,
AFCDDBB90AE176D900E30447 /* CMatchItem.h */,
AFCDDBBA0AE176D900E30447 /* CMatchItem.cp */,
AFCDDBBB0AE176D900E30447 /* CKeyAction.h */,
AFCDDBB30AE176D900E30447 /* CIdentity.h */,
AFCDDB9E0AE176D900E30447 /* CINETAccount.cp */,
AFCDDB9D0AE176D900E30447 /* CINETAccount.h */,
AFCDDBBC0AE176D900E30447 /* CKeyAction.cp */,
AFCDDBBD0AE176D900E30447 /* CTextMacros.h */,
AFCDDBBE0AE176D900E30447 /* CTextMacros.cp */,
AFCDDBBF0AE176D900E30447 /* CMIMEMap.h */,
AFCDDBBB0AE176D900E30447 /* CKeyAction.h */,
AFCDDBA00AE176D900E30447 /* CMailAccount.cp */,
AFCDDB9F0AE176D900E30447 /* CMailAccount.h */,
AFCDDBB20AE176D900E30447 /* CMailNotification.cp */,
AFCDDBB10AE176D900E30447 /* CMailNotification.h */,
AFCDDBA60AE176D900E30447 /* CManageSIEVEAccount.cp */,
AFCDDBA50AE176D900E30447 /* CManageSIEVEAccount.h */,
AFCDDBBA0AE176D900E30447 /* CMatchItem.cp */,
AFCDDBB90AE176D900E30447 /* CMatchItem.h */,
AFCDDBC00AE176D900E30447 /* CMIMEMap.cp */,
AFCDDBC10AE176D900E30447 /* CRemotePrefsSets.h */,
AFCDDBC20AE176D900E30447 /* CRemotePrefsSets.cp */,
AFCDDBC30AE176D900E30447 /* CDayWeekViewTimeRange.h */,
AFCDDBC40AE176D900E30447 /* CDayWeekViewTimeRange.cpp */,
AFCDDBC50AE176D900E30447 /* CPreferencesFile.h */,
AFCDDBC60AE176D900E30447 /* CPreferencesFile.cp */,
AFCDDBC70AE176D900E30447 /* COptionsMap.h */,
AFCDDBBF0AE176D900E30447 /* CMIMEMap.h */,
AFCDDBB00AE176D900E30447 /* CNotification.cp */,
AFCDDBAF0AE176D900E30447 /* CNotification.h */,
AFBE2AB80D2F34A4002132BE /* COptionsAccount.cp */,
AFBE2AB90D2F34A4002132BE /* COptionsAccount.h */,
AFCDDBC80AE176D900E30447 /* COptionsMap.cp */,
AFCDDBC90AE176D900E30447 /* CBlockOptionsMap.h */,
AFCDDBCA0AE176D900E30447 /* CBlockOptionsMap.cp */,
AFCDDBCB0AE176D900E30447 /* CStreamOptionsMap.h */,
AFCDDBC70AE176D900E30447 /* COptionsMap.h */,
AFCDDBAE0AE176D900E30447 /* COSStringMap.cp */,
AFCDDBAD0AE176D900E30447 /* COSStringMap.h */,
AFCDDB960AE176D900E30447 /* CPreferenceEnum.cp */,
AFCDDB950AE176D900E30447 /* CPreferenceEnum.h */,
AFCDDB8B0AE176D900E30447 /* CPreferenceKeys.cp */,
AFCDDB8A0AE176D900E30447 /* CPreferenceKeys.h */,
AFCDDB910AE176D900E30447 /* CPreferences.cp */,
AFCDDB900AE176D900E30447 /* CPreferences.h */,
AFCDDB920AE176D900E30447 /* CPreferencesBits.cp */,
AFCDDBC60AE176D900E30447 /* CPreferencesFile.cp */,
AFCDDBC50AE176D900E30447 /* CPreferencesFile.h */,
AFCDDB940AE176D900E30447 /* CPreferencesRW.cp */,
AFCDDB930AE176D900E30447 /* CPreferencesXtra.cp */,
AFCDDBD20AE176D900E30447 /* CRemoteOptionsMap.cp */,
AFCDDBD10AE176D900E30447 /* CRemoteOptionsMap.h */,
AFCDDBC20AE176D900E30447 /* CRemotePrefsSets.cp */,
AFCDDBC10AE176D900E30447 /* CRemotePrefsSets.h */,
AFCDDB890AE176D900E30447 /* CScreenDimensions.cp */,
AFCDDB880AE176D900E30447 /* CScreenDimensions.h */,
AFCDDBB80AE176D900E30447 /* CSearchStyle.cp */,
AFCDDBB70AE176D900E30447 /* CSearchStyle.h */,
AFCDDBA20AE176D900E30447 /* CSMTPAccount.cp */,
AFCDDBA10AE176D900E30447 /* CSMTPAccount.h */,
AFCDDBCC0AE176D900E30447 /* CStreamOptionsMap.cp */,
AFCDDBCD0AE176D900E30447 /* CStringOptionsMap.h */,
AFCDDBCB0AE176D900E30447 /* CStreamOptionsMap.h */,
AFCDDBCE0AE176D900E30447 /* CStringOptionsMap.cp */,
AFCDDBCF0AE176D900E30447 /* CFileOptionsMap.h */,
AFCDDBD00AE176D900E30447 /* CFileOptionsMap.cp */,
AFCDDBD10AE176D900E30447 /* CRemoteOptionsMap.h */,
AFCDDBD20AE176D900E30447 /* CRemoteOptionsMap.cp */,
AFCDDBCD0AE176D900E30447 /* CStringOptionsMap.h */,
AFCDDBBE0AE176D900E30447 /* CTextMacros.cp */,
AFCDDBBD0AE176D900E30447 /* CTextMacros.h */,
AFCDDB860AE176D900E30447 /* CWindowStates.cp */,
AFCDDB850AE176D900E30447 /* CWindowStates.h */,
AFCDDB840AE176D900E30447 /* CWindowStatesFwd.h */,
AFCDDB870AE176D900E30447 /* CWindowStatesXtras.cp */,
AFCDDB980AE176D900E30447 /* prefsvector.cp */,
AFCDDB970AE176D900E30447 /* prefsvector.h */,
);
name = Preferences;
sourceTree = "<group>";
Expand Down
Binary file modified MacOS/Resources/Mulberry.PPob
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion MacOS/Resources/MulberryBits.r
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions MacOS/Resources/MulberryVers.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
limitations under the License.
*/

#include "Resources/RsrcTypes.r"
#include "RsrcTypes.r"

resource 'vers' (1) {
0x4,
0x10,
alpha,
0x1,
0x3,
0,
"v4.1a1",
"Mulberry v4.1a1, © Cyrus Daboo, 2006-2009."
"v4.1a3",
"Mulberry v4.1a3, © Cyrus Daboo, 2006-2012."
};

resource 'vers' (2) {
Expand All @@ -32,6 +32,6 @@ resource 'vers' (2) {
alpha,
0x1,
0,
"v4.1a1",
"Mulberry v4.1a1"
"v4.1a3",
"Mulberry v4.1a3"
};
6 changes: 3 additions & 3 deletions MacOS/Sources/Application/Address_Book/CAddressFieldMultiLine.cp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ void CAddressFieldMultiLine::SetDetails(const cdstring& title, int type, const c
mOriginalData = data;

mTitle->SetText(title);
if (type != 0)
mType->SetValue(type);
if (mUsesType)
mType->SetValue(type + 1);
mData->SetText(data);
}

Expand All @@ -76,7 +76,7 @@ bool CAddressFieldMultiLine::GetDetails(int& newtype, cdstring& newdata)

if (mUsesType)
{
newtype = mType->GetValue();
newtype = mType->GetValue() - 1;
if (newtype != mOriginalType)
changed = true;
}
Expand Down
Loading