Update of /cvsroot/mahogany/M/src/mail
In directory usw-pr-cvs1:/tmp/cvs-serv15411/src/mail
Modified Files:
MailFolderCC.cpp
Log Message:
fixed generating IMAP spec for POP folders: it didn't include the login before
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.637
retrieving revision 1.638
diff -b -u -2 -r1.637 -r1.638
--- MailFolderCC.cpp 21 Aug 2002 14:03:40 -0000 1.637
+++ MailFolderCC.cpp 28 Aug 2002 00:05:02 -0000 1.638
@@ -1198,5 +1198,18 @@
}
- switch( type )
+ if ( FolderTypeHasServer(type) )
+ {
+ // remote spec starts with '{'
+ mboxpath << '{' << server << GetSSLOptions(flags);
+
+ // if it has server, it must have a login as well
+ if ( !login.empty() )
+ mboxpath << "/user=" << login;
+ else if ( flags & MF_FLAGS_ANON )
+ mboxpath << "/anonymous";
+ //else: we'll ask the user about his login later
+ }
+
+ switch ( type )
{
case MF_INBOX:
@@ -1246,21 +1259,9 @@
case MF_POP:
- mboxpath << '{' << server << "/pop3" << GetSSLOptions(flags) << '}';
+ mboxpath << "/pop3}";
break;
case MF_IMAP:
- mboxpath << '{' << server;
- if ( flags & MF_FLAGS_ANON )
- {
- mboxpath << "/anonymous";
- }
- else
- {
- if( !login.empty() )
- mboxpath << "/user=" << login ;
- //else: we get asked later
- }
-
- mboxpath << GetSSLOptions(flags) << '}' << name;
+ mboxpath << '}' << name;
break;
@@ -1270,6 +1271,5 @@
case MF_NNTP:
- mboxpath << '{' << server << "/nntp"
- << GetSSLOptions(flags) << '}' << name;
+ mboxpath << "/nntp}" << name;
break;
-------------------------------------------------------
This sf.net email is sponsored by: Jabber - The world's fastest growing
real-time communications platform! Don't just IM. Build it in!
http://www.jabber.com/osdn/xim
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
