Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv31342/src/classes
Modified Files:
MessageView.cpp
Log Message:
use separate temp profile for standalone message views to avoid modifying main folder
options while using them
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -b -u -2 -r1.136 -r1.137
--- MessageView.cpp 7 Oct 2003 11:03:36 -0000 1.136
+++ MessageView.cpp 7 Oct 2003 22:48:44 -0000 1.137
@@ -520,6 +520,10 @@
void
-MessageView::Init(wxWindow *parent)
+MessageView::Init(wxWindow *parent, Profile *profile)
{
+ m_profile = profile;
+ if ( m_profile )
+ m_profile->IncRef();
+
m_viewer = CreateDefaultViewer();
m_viewer->Create(this, parent);
@@ -531,4 +535,5 @@
MessageView::Init()
{
+ m_profile = NULL;
m_asyncFolder = NULL;
m_mailMessage = NULL;
@@ -554,4 +559,5 @@
SafeDecRef(m_mailMessage);
SafeDecRef(m_asyncFolder);
+ SafeDecRef(m_profile);
delete m_filters;
@@ -743,5 +749,4 @@
// finally, enable/disable it initially as configured
Profile *profile = GetProfile();
- CHECK_RET( profile, _T("no profile in InitializeViewFilters?") );
int enable = profile->readEntryFromHere(name, -1);
@@ -773,5 +778,4 @@
Profile *profile = GetProfile();
- CHECK_RET( profile, _T("no profile in UpdateViewFiltersState?") );
// we never change the status of the last filter (transparent one), so stop
@@ -880,6 +884,5 @@
{
// always return something non NULL
- return m_asyncFolder ? m_asyncFolder->GetProfile()
- : mApplication->GetProfile();
+ return m_profile ? m_profile : mApplication->GetProfile();
}
@@ -2816,5 +2819,4 @@
Profile *profile = GetProfile();
- CHECK( profile, false, _T("no profile in message view?") );
switch ( id )
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
