[evolution-patches] 71003 again - quitting with threads running





seems the last patch did exactly what it was trying to avoid ...

this one should ensure all folders are synced/threads complete (or cancelled) before quitting.

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3605
diff -u -p -r1.3605 ChangeLog
--- mail/ChangeLog	16 Mar 2005 06:50:46 -0000	1.3605
+++ mail/ChangeLog	16 Mar 2005 09:34:29 -0000
@@ -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
Index: mail/mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.109
diff -u -p -r1.109 mail-component.c
--- mail/mail-component.c	25 Feb 2005 03:39:12 -0000	1.109
+++ mail/mail-component.c	16 Mar 2005 09:34:32 -0000
@@ -693,7 +693,7 @@ impl_quit(PortableServer_Servant servant
 		/* 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
 		/* 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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]