Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv28101/src/gui
Modified Files:
wxFolderView.cpp
Log Message:
fixed more crashes when the folder was closed unexpectedly
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.588
retrieving revision 1.589
diff -b -u -2 -r1.588 -r1.589
--- wxFolderView.cpp 28 Jun 2002 23:03:32 -0000 1.588
+++ wxFolderView.cpp 2 Jul 2002 21:21:45 -0000 1.589
@@ -3184,5 +3184,5 @@
bool wxFolderView::MoveToNextUnread(bool takeNextIfNoUnread)
{
- if ( !READ_CONFIG(m_Profile, MP_FVIEW_AUTONEXT_UNREAD_MSG) )
+ if ( !m_settings.autoNextUnread )
{
// this feature is disabled
@@ -3424,4 +3424,12 @@
settings->previewDelay = READ_CONFIG(profile, MP_FVIEW_PREVIEW_DELAY);
settings->focusOnMouse = READ_CONFIG_BOOL(profile, MP_FOCUS_FOLLOWSMOUSE);
+ settings->autoNextUnread = READ_CONFIG_BOOL(profile, MP_FVIEW_AUTONEXT_UNREAD_MSG);
+ settings->usingTrash = READ_CONFIG_BOOL(profile, MP_USE_TRASH_FOLDER);
+
+ settings->updateStatus = READ_CONFIG_BOOL(profile, MP_FVIEW_STATUS_UPDATE);
+ if ( settings->updateStatus )
+ {
+ settings->statusFormat = READ_CONFIG(profile, MP_FVIEW_STATUS_FMT);
+ }
ReadColumnsInfo(profile, settings->columns);
@@ -4100,5 +4108,5 @@
// only move on if we mark as deleted, for trash usage, selection
// remains the same:
- if ( READ_CONFIG(m_Profile, MP_USE_TRASH_FOLDER) )
+ if ( m_settings.usingTrash )
{
// don't move focus
@@ -4514,15 +4522,14 @@
idx, uid);
- if ( uid != UID_ILLEGAL && READ_CONFIG(m_Profile, MP_FVIEW_STATUS_UPDATE) )
+ if ( uid != UID_ILLEGAL && m_settings.updateStatus )
{
HeaderInfoList_obj hil = GetFolder()->GetHeaders();
CHECK_RET( hil, "failed to get headers" );
- wxString fmt = READ_CONFIG(m_Profile, MP_FVIEW_STATUS_FMT);
HeaderVarExpander expander(hil[idx],
m_settings.dateFormat,
m_settings.dateGMT);
- wxLogStatus(m_Frame, ParseMessageTemplate(fmt, expander));
+ wxLogStatus(m_Frame, ParseMessageTemplate(m_settings.statusFormat, expander));
}
//else: no status message
-------------------------------------------------------
Sponsored by:
ThinkGeek at http://www.ThinkGeek.com/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
