Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv4158/src/modules
Modified Files:
Calendar.cpp
Log Message:
fixed many crashes and a few other bugs in the calendar module (fixes bug 616)
Index: Calendar.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Calendar.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -u -2 -r1.34 -r1.35
--- Calendar.cpp 21 Dec 2001 13:34:31 -0000 1.34
+++ Calendar.cpp 28 Mar 2002 23:42:48 -0000 1.35
@@ -685,8 +685,14 @@
CalendarFrame::Show(bool show)
{
+ // don't do anything when the app is shutting down, if we have somethign to
+ // do it should be done in OnClose() (TODO)
+ if ( m_MInterface->GetMApplication()->IsRunning() )
+ {
if(m_Show == FALSE)
CheckUpdate();
m_Show = show;
m_Module->m_CalendarMenu->Check(WXMENU_MODULES_CALENDAR_SHOW, m_Show);
+ }
+
return wxFrame::Show(show);
}
@@ -714,5 +720,5 @@
// settings read from folder profile:
- Profile *fp = m_MInterface->CreateProfile(m_FolderName);
+ Profile *fp = m_MInterface->CreateModuleProfile(m_FolderName);
m_MyEmail = READ_CONFIG_TEXT(fp, MP_FROM_ADDRESS);
@@ -862,11 +868,13 @@
{
// we are using synchronous access which is soo much easier:
- ASSERT(m_Folder);
- if(! m_Folder) return;
+ CHECK_RET( m_Folder, "no calendar folder in the calendar module" );
MailFolder *mf = m_Folder->GetMailFolder();
- ASSERT(mf);
if(! mf)
+ {
+ wxLogError(_("Cannot open calendar folder"));
return;
+ }
+
HeaderInfoList *hil = mf->GetHeaders();
if(hil)
@@ -950,7 +958,12 @@
CalendarFrame::CheckUpdate(MailFolder *eventFolder)
{
+ CHECK_RET( m_Folder, "no calendar folder in the calendar module" );
+
MailFolder *mf = m_Folder->GetMailFolder();
- ASSERT(mf);
- if(! mf) return;
+ if ( !mf )
+ {
+ wxLogError(_("Cannot open calendar folder"));
+ return;
+ }
// we react to an event which isn't ours, abort
@@ -1110,5 +1123,5 @@
m_CalendarMenu = new wxMenu("", wxMENU_TEAROFF);
m_CalendarMenu->Append(WXMENU_MODULES_CALENDAR_SHOW, _("&Show"), "", TRUE);
- m_CalendarMenu->Break();
+ m_CalendarMenu->AppendSeparator();
m_CalendarMenu->Append(WXMENU_MODULES_CALENDAR_CONFIG, _("&Configure"));
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
