Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7152/src/mail
Modified Files:
MailFolderCC.cpp MailFolder.cpp
Log Message:
made GetLogicalMailboxName() static
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.710
retrieving revision 1.711
diff -b -u -2 -r1.710 -r1.711
--- MailFolderCC.cpp 1 Jul 2005 18:04:10 -0000 1.710
+++ MailFolderCC.cpp 6 Jul 2005 22:00:02 -0000 1.711
@@ -186,11 +186,4 @@
#define ILLEGAL_DELIMITER ((char)-1)
-// special suffix which we use to implement mailboxes containing both messages
-// and other mailboxes with drivers which don't support this: if it's
-// impossible to put both messages and mailboxes in a mailbox "foo", we create
-// a mailbox "foo.messages" for the messages and use "foo" only for children
-static const char *MAILBOX_MSGS_SUFFIX = ".messages";
-static const size_t MAILBOX_MSGS_SUFFIX_LEN = strlen(MAILBOX_MSGS_SUFFIX);
-
// ----------------------------------------------------------------------------
// trace masks used (you have to wxLog::AddTraceMask() to enable the
@@ -205,5 +198,5 @@
// ----------------------------------------------------------------------------
-// global functions prototypes
+// functions prototypes
// ----------------------------------------------------------------------------
@@ -5394,13 +5387,4 @@
}
-static String RemoveMsgsSuffix(const String& namePhysical)
-{
- String name(namePhysical);
- if ( name.Right(MAILBOX_MSGS_SUFFIX_LEN) == MAILBOX_MSGS_SUFFIX )
- name.RemoveLast(MAILBOX_MSGS_SUFFIX_LEN);
-
- return name;
-}
-
void
MailFolderCC::ListFolders(ASMailFolder *asmf,
@@ -5420,6 +5404,6 @@
// hack: if the folder ends with this special suffix, the driver doesn't
// support "dual use" mailboxes and so any child mailboxes are put under
- // "foo" and not "foo.messages" (see comment near MAILBOX_MSGS_SUFFIX)
- String spec = RemoveMsgsSuffix(m_ImapSpec);
+ // "foo" and not "foo.messages" (see comment in GetLogicalMailboxName())
+ String spec = GetLogicalMailboxName(m_ImapSpec);
@@ -5547,9 +5531,4 @@
}
-String MailFolderCC::GetLogicalMailboxName(const String& name)
-{
- return RemoveMsgsSuffix(name);
-}
-
// ----------------------------------------------------------------------------
// delete folder
Index: MailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolder.cpp,v
retrieving revision 1.315
retrieving revision 1.316
diff -b -u -2 -r1.315 -r1.316
--- MailFolder.cpp 30 Jun 2005 23:39:48 -0000 1.315
+++ MailFolder.cpp 6 Jul 2005 22:00:03 -0000 1.316
@@ -1122,5 +1122,5 @@
// ----------------------------------------------------------------------------
-// folder delimiter stuff
+// folder names metainfo
// ----------------------------------------------------------------------------
@@ -1168,4 +1168,22 @@
}
+/* static */
+String MailFolder::GetLogicalMailboxName(const String& namePhysical)
+{
+ // special suffix which we use to implement mailboxes containing both
+ // messages and other mailboxes with drivers which don't support this: if
+ // it's impossible to put both messages and mailboxes in a mailbox "foo", we
+ // create a mailbox "foo.messages" for the messages and use "foo" only for
+ // children
+ static const char *MAILBOX_MSGS_SUFFIX = ".messages";
+ static const size_t MAILBOX_MSGS_SUFFIX_LEN = strlen(MAILBOX_MSGS_SUFFIX);
+
+ String name(namePhysical);
+ if ( name.Right(MAILBOX_MSGS_SUFFIX_LEN) == MAILBOX_MSGS_SUFFIX )
+ name.RemoveLast(MAILBOX_MSGS_SUFFIX_LEN);
+
+ return name;
+}
+
// ----------------------------------------------------------------------------
// MailFolder flags
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
