Update of /cvsroot/mahogany/M/src/mail
In directory usw-pr-cvs1:/tmp/cvs-serv8445/src/mail
Modified Files:
MailFolderCC.cpp
Log Message:
don't show to the user IMAP server messages when we close the connections which we
artificially kept alive
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.611
retrieving revision 1.612
diff -b -u -2 -r1.611 -r1.612
--- MailFolderCC.cpp 27 Apr 2002 22:41:36 -0000 1.611
+++ MailFolderCC.cpp 28 Apr 2002 14:53:43 -0000 1.612
@@ -6244,30 +6244,37 @@
#define TRACE_CALLBACK0(name) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s)", \
- #name, GetStreamMailbox(stream))
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(%s)%s", \
+ #name, GetStreamMailbox(stream), \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK1(name, fmt, parm) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")", \
- #name, GetStreamMailbox(stream), parm)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ #name, GetStreamMailbox(stream), parm, \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK2(name, fmt, parm1, parm2) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")", \
- #name, GetStreamMailbox(stream), parm1, parm2)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ #name, GetStreamMailbox(stream), parm1, parm2, \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK3(name, fmt, parm1, parm2, parm3) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")", \
- #name, GetStreamMailbox(stream), parm1, parm2, parm3)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ #name, GetStreamMailbox(stream), parm1, parm2, parm3, \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_1(name, fmt, parm1) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")", \
- #name, parm1)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ #name, parm1, \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_2(name, fmt, parm1, parm2) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")", \
- #name, parm1, parm2)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ #name, parm1, parm2, \
+ mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_5(name, fmt, parm1, parm2, parm3, parm4, parm5) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")", \
- #name, parm1, parm2, parm3, parm4, parm5)
+ wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ #name, parm1, parm2, parm3, parm4, parm5, \
+ mm_disable_callbacks ? " [disabled]" : "")
#else // !EXPERIMENTAL_log_callbacks
#define TRACE_CALLBACK0(name)
@@ -6289,8 +6296,8 @@
mm_searched(MAILSTREAM *stream, unsigned long msgno)
{
- if ( !mm_disable_callbacks )
- {
TRACE_CALLBACK1(mm_searched, "%lu", msgno);
+ if ( !mm_disable_callbacks )
+ {
MailFolderCC::mm_searched(stream, msgno);
}
@@ -6300,8 +6307,8 @@
mm_expunged(MAILSTREAM *stream, unsigned long msgno)
{
- if ( !mm_disable_callbacks )
- {
TRACE_CALLBACK1(mm_expunged, "%lu", msgno);
+ if ( !mm_disable_callbacks )
+ {
MailFolderCC::mm_expunged(stream, msgno);
}
@@ -6311,8 +6318,8 @@
mm_flags(MAILSTREAM *stream, unsigned long msgno)
{
- if ( !mm_disable_callbacks )
- {
TRACE_CALLBACK1(mm_flags, "%lu", msgno);
+ if ( !mm_disable_callbacks )
+ {
MailFolderCC::mm_flags(stream, msgno);
}
@@ -6322,8 +6329,8 @@
mm_notify(MAILSTREAM *stream, char *str, long errflg)
{
- if ( !mm_disable_callbacks )
- {
TRACE_CALLBACK2(mm_notify, "%s (%s)", str, GetErrorLevel(errflg));
+ if ( !mm_disable_callbacks )
+ {
MailFolderCC::mm_notify(stream, str, errflg);
}
@@ -6349,8 +6356,8 @@
mm_exists(MAILSTREAM *stream, unsigned long msgno)
{
- if ( !mm_disable_callbacks )
- {
TRACE_CALLBACK1(mm_exists, "%lu", msgno);
+ if ( !mm_disable_callbacks )
+ {
MailFolderCC::mm_exists(stream, msgno);
}
@@ -6360,4 +6367,6 @@
mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
{
+ TRACE_CALLBACK1(mm_status, "%s", mailbox);
+
// allow redirected callbacks even while all others are disabled
if ( gs_mmStatusRedirect )
@@ -6367,6 +6376,4 @@
else if ( !mm_disable_callbacks )
{
- TRACE_CALLBACK1(mm_status, "%s", mailbox);
-
MailFolderCC::mm_status(stream, mailbox, status);
}
@@ -6376,9 +6383,9 @@
mm_log(char *str, long errflg)
{
+ TRACE_CALLBACK_NOSTREAM_2(mm_log, "%s (%s)", str, GetErrorLevel(errflg));
+
if ( mm_disable_callbacks || mm_ignore_errors )
return;
- TRACE_CALLBACK_NOSTREAM_2(mm_log, "%s (%s)", str, GetErrorLevel(errflg));
-
String msg(str);
@@ -6396,4 +6403,6 @@
mm_dlog(char *str)
{
+ TRACE_CALLBACK_NOSTREAM_1(mm_dlog, "%s", str);
+
// always show debug logs, even if other callbacks are disabled - this
// makes it easier to understand what's going on
@@ -6401,6 +6410,4 @@
// if ( !mm_disable_callbacks )
{
- TRACE_CALLBACK_NOSTREAM_1(mm_dlog, "%s", str);
-
MailFolderCC::mm_dlog(str);
}
@@ -6665,4 +6672,7 @@
wxLogTrace(TRACE_CONN_CACHE,
"Connection to %s timed out, closing.", stream->mailbox);
+
+ // we're not interested in getting mail_close() babble
+ CCCallbackDisabler cc;
mail_close(stream);
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
