[evolution-patches] 34153, "unsent mail: do you want to exit" when they're deleted

[Not Zed <notzed ximian com>]

? mail/ems.diff
? mail/evolution-mail-2.0.schemas
? mail/m.diff
? mail/ma.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3577
diff -u -p -r1.3577 ChangeLog
--- mail/ChangeLog	21 Feb 2005 06:37:13 -0000	1.3577
+++ mail/ChangeLog	21 Feb 2005 09:55:53 -0000
@@ -1,3 +1,10 @@
+2005-02-21  Not Zed  <NotZed Ximian com>
+
+	** See bug #34153 and no doubt duplicates
+
+	* mail-component.c (impl_requestQuit): use the VISIBLE count not
+	the TOTAL count to check if there are unsent emails.
+
 2005-02-14  Not Zed  <NotZed Ximian com>
 
 	** See bug #61363 & e-util/ChangeLog
Index: mail/mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.106
diff -u -p -r1.106 mail-component.c
--- mail/mail-component.c	1 Feb 2005 08:35:03 -0000	1.106
+++ mail/mail-component.c	21 Feb 2005 09:55:54 -0000
@@ -615,14 +615,16 @@ impl_requestQuit(PortableServer_Servant 
 {
 	/*MailComponent *mc = MAIL_COMPONENT(bonobo_object_from_servant(servant));*/
 	CamelFolder *folder;
+	guint32 unsent;
 
 	if (!e_msg_composer_request_close_all())
 		return FALSE;
 	
 	folder = mc_default_folders[MAIL_COMPONENT_FOLDER_OUTBOX].folder;
 	if (folder != NULL
-	    && camel_folder_get_message_count(folder) != 0
 	    && camel_session_is_online(session)
+	    && camel_object_get(folder, NULL, CAMEL_FOLDER_VISIBLE, &unsent, 0) == 0
+	    && unsent > 0
 	    && e_error_run(NULL, "mail:exit-unsaved", NULL) != GTK_RESPONSE_YES)
 		return FALSE;