Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9935
Modified Files:
MailFolderCC.cpp MessageCC.cpp Pop3.cpp
Log Message:
updated to work with UW IMAP 2004
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.697
retrieving revision 1.698
diff -b -u -2 -r1.697 -r1.698
--- MailFolderCC.cpp 8 Apr 2004 17:56:55 -0000 1.697
+++ MailFolderCC.cpp 24 Apr 2004 23:14:30 -0000 1.698
@@ -4114,8 +4114,8 @@
CHECK( stream, false, _T("MailStreamHasThreader: folder is closed") );
- IMAPLOCAL *imapLocal = (IMAPLOCAL *)stream->local;
+ IMAPCAP *imapCap = imap_cap(stream);
THREADER *thr;
- for ( thr = imapLocal->cap.threader;
+ for ( thr = imapCap->threader;
thr && compare_cstring(thr->name, (char *)thrName);
thr = thr->next )
@@ -4169,8 +4169,8 @@
// threading support in its CAPABILITY reply, so just use the
// first threading method available
- IMAPLOCAL *imapLocal = (IMAPLOCAL *)m_MailStream->local;
- if ( imapLocal->cap.threader )
+ IMAPCAP *imapCap = imap_cap(m_MailStream);
+ if ( imapCap->threader )
{
- threadingAlgo = imapLocal->cap.threader->name;
+ threadingAlgo = imapCap->threader->name;
}
}
Index: MessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MessageCC.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -b -u -2 -r1.148 -r1.149
--- MessageCC.cpp 16 Dec 2003 01:47:32 -0000 1.148
+++ MessageCC.cpp 24 Apr 2004 23:14:30 -0000 1.149
@@ -265,9 +265,8 @@
else
{
- if ( !m_Envelope->ngbogus )
+ if ( !m_Envelope->newsgroups )
{
newsgroups = wxConvertMB2WX(m_Envelope->newsgroups);
}
- //else: what does ngbogus really mean??
}
Index: Pop3.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Pop3.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- Pop3.cpp 12 Oct 2003 17:24:19 -0000 1.7
+++ Pop3.cpp 24 Apr 2004 23:14:30 -0000 1.8
@@ -29,7 +29,6 @@
extern "C"
{
- #undef LOCAL // previously defined in other cclient headers
- #include <pop3.h> // for pop3_xxx() functions
- #undef LOCAL // prevent clashes with other headers
+ long pop3_send (MAILSTREAM *stream,char *command,char *args);
+ NETSTREAM *pop3_getnetstream(MAILSTREAM *stream);
}
@@ -232,5 +231,5 @@
uidls.Alloc(stream->nmsgs);
- NETSTREAM *netstream = ((POP3LOCAL *)stream->local)->netstream;
+ NETSTREAM *netstream = pop3_getnetstream(stream);
for ( ;; )
{
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
