aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-component.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index fe454129dd..730130725c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-16 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #71003, again.
+
+ * mail-component.c (impl_quit): fix sense of 'can quit' logic.
+
2005-03-14 Not Zed <NotZed@Ximian.com>
** See bug #73550
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 817d23114f..e831978235 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -693,7 +693,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev)
/* Falls through */
case MC_QUIT_SYNC:
if (mc->priv->quit_count > 0)
- return TRUE;
+ return FALSE;
mail_cancel_all();
mc->priv->quit_state = MC_QUIT_THREADS;
@@ -701,7 +701,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev)
/* Falls through */
case MC_QUIT_THREADS:
/* should we keep cancelling? */
- return mail_msg_active((unsigned int)-1) == 0;
+ return !mail_msg_active((unsigned int)-1);
}
return TRUE;