[evolution-patches] 67408, crash on exit

[Not Zed <notzed ximian com>]

probably should fix this rare crash

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.20
diff -u -3 -r1.3444.2.20 ChangeLog
--- mail/ChangeLog	7 Oct 2004 01:09:09 -0000	1.3444.2.20
+++ mail/ChangeLog	11 Oct 2004 06:36:32 -0000
@@ -1,3 +1,11 @@
+2004-10-11  Not Zed  <NotZed Ximian com>
+
+	** See bug #67408.
+
+	* em-folder-view.c (emfv_gui_folder_changed): noop if we were
+	destroyed.
+	(emfv_destroy): set destroyed bit.
+
 2004-09-28  Not Zed  <NotZed Ximian com>
 
 	* em-composer-utils.c (forward_non_attached): put back in the
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.85
diff -u -3 -r1.85 em-folder-view.c
--- mail/em-folder-view.c	28 Jul 2004 14:38:50 -0000	1.85
+++ mail/em-folder-view.c	11 Oct 2004 06:36:32 -0000
@@ -126,6 +126,7 @@
 	guint seen_id;
 	guint setting_notify_id;
 	int nomarkseen:1;
+	int destroyed:1;
 
 	CamelObjectHookID folder_changed_id;
 
@@ -218,6 +219,8 @@
 	EMFolderView *emfv = (EMFolderView *) o;
 	struct _EMFolderViewPrivate *p = emfv->priv;
 
+	p->destroyed = TRUE;
+
 	if (p->seen_id) {
 		g_source_remove(p->seen_id);
 		p->seen_id = 0;
@@ -2179,9 +2182,10 @@
 static void
 emfv_gui_folder_changed(CamelFolder *folder, void *dummy, EMFolderView *emfv)
 {
-	emfv_enable_menus(emfv);
-
-	g_signal_emit(emfv, signals[EMFV_LOADED], 0);
+	if (!emfv->priv->destroyed) {
+		emfv_enable_menus(emfv);
+		g_signal_emit(emfv, signals[EMFV_LOADED], 0);
+	}
 	g_object_unref(emfv);
 }