Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31270/src/gui
Modified Files:
wxFolderTree.cpp
Log Message:
added check for NULL folder in FindNextUnreadFolder() (shouldn't be needed but
somehow it seems to crash without it in release build
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.242
retrieving revision 1.243
diff -b -u -2 -r1.242 -r1.243
--- wxFolderTree.cpp 28 Jun 2006 00:59:16 -0000 1.242
+++ wxFolderTree.cpp 28 Jun 2006 12:46:34 -0000 1.243
@@ -2287,15 +2287,11 @@
return wxTreeItemId();
- id = GetNextItem(id, next);
- if ( !id.IsOk() )
- {
- return id;
- }
-
// check first this item, then the next one(s)
- do
+ for ( id = GetNextItem(id, next); id.IsOk(); id = GetNextItem(id, next) )
{
- MFolder *folder = GetFolderTreeNode(id)->GetFolder();
- wxString name = folder->GetFullName();
+ MFolder *folder = GetFolderFromTreeItem(id);
+ if ( !folder )
+ continue;
+
Profile_obj profile(folder->GetProfile());
@@ -2306,13 +2302,11 @@
// does it have any unread messages?
MailFolderStatus status;
- if ( mfStatus->GetStatus(name, &status) && status.unread )
+ if ( mfStatus->GetStatus(folder->GetFullName(), &status) &&
+ status.unread )
{
return id;
}
}
-
- id = GetNextItem(id, next);
}
- while ( id.IsOk() );
return id;
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
