Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv15854/include
Modified Files:
FolderType.h MFolder.h Moptions.h
Log Message:
added MF_VIRTUAL and use the type now to choose the folder class instead of profile
entry
Index: FolderType.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/FolderType.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -b -u -2 -r1.54 -r1.55
--- FolderType.h 4 Jul 2002 17:22:36 -0000 1.54
+++ FolderType.h 21 Jul 2002 19:28:05 -0000 1.55
@@ -31,5 +31,7 @@
{
// the MF_XXX constants have the same values as c-client folder types
- MF_ILLEGAL = 0xff, // illegal type - cannot use -1 because of bitmask
+ MF_ILLEGAL = 0xff, // illegal (don't use -1 because of bitmask)
+
+ // real folder types
MF_INBOX = 0, // system inbox
MF_FILE = 1, // mbox file
@@ -40,24 +42,14 @@
MF_MH = 6, // MH folder (directory/files)
- // these two are still experimental and not always compiled in:
+ // these two are experimental
MF_MFILE = 7, // the Mahogany file type
MF_MDIR = 8, // the Mahogany dir type
-// no longer used MF_PROFILE_OR_FILE, // profile, if it doesn't work, file
MF_PROFILE = 10, // read type etc from profile
-
- // real folder types
- Inbox = MF_INBOX, // system inbox
- File = MF_FILE, // local file (MBOX format)
- POP = MF_POP, // POP3 server
- IMAP = MF_IMAP, // IMAP4 server
- Nntp = MF_NNTP, // NNTP server
- News = MF_NEWS,
+ MF_VIRTUAL, // virtual folder
// pseudo types
MF_GROUP = 0x20, // only used for grouping other folders
- MF_ROOT = 0xfe, // this is the the special root pseudo-folder
-
- FolderInvalid = MF_ILLEGAL // folder not initialized properly
+ MF_ROOT = 0xfe // this is the special root pseudo-folder
};
Index: MFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFolder.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -b -u -2 -r1.50 -r1.51
--- MFolder.h 17 Jul 2002 00:06:28 -0000 1.50
+++ MFolder.h 21 Jul 2002 19:28:06 -0000 1.51
@@ -111,6 +111,5 @@
@return folder (should be DecRef()'d by caller) or NULL on error
*/
- static MFolder *CreateTemp(const String& kind,
- const String& fullname,
+ static MFolder *CreateTemp(const String& fullname,
MFolderType type,
Profile *profile = NULL);
Index: Moptions.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Moptions.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -b -u -2 -r1.52 -r1.53
--- Moptions.h 5 Jul 2002 17:58:35 -0000 1.52
+++ Moptions.h 21 Jul 2002 19:28:07 -0000 1.53
@@ -210,5 +210,4 @@
extern const MOption MP_COMPOSE_XFACE_FILE;
extern const MOption MP_FOLDER_TYPE;
-extern const MOption MP_FOLDER_CLASS;
extern const MOption MP_FOLDER_TRY_CREATE;
extern const MOption MP_FOLDER_ICON;
@@ -788,6 +787,4 @@
/// the folder type for a mailbox (see enum in MFolder class)
#define MP_FOLDER_TYPE_NAME "Type"
-/// the folder class
-#define MP_FOLDER_CLASS_NAME "Class"
/// should we try to create the folder before opening it?
#define MP_FOLDER_TRY_CREATE_NAME "TryCreate"
@@ -1586,6 +1583,4 @@
/// the folder type for a mailbox
#define MP_FOLDER_TYPE_DEFVAL (long)(0x00ff) // MF_ILLEGAL
-/// the folder class
-#define MP_FOLDER_CLASS_DEFVAL ""
/// should we try to create the folder before opening it?
#define MP_FOLDER_TRY_CREATE_DEFVAL 0L
-------------------------------------------------------
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
