+ * widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and

+	text->timeout on destroy.
+
+	* e-shell-view.c (bonobo_widget_is_dead): Helper function to see
+	whether a bonobo widget is a zombie (ie the remote bonobo control
+	died).
+	(e_shell_view_set_view): Try to respawn dead bonobo widgets.

svn path=/trunk/; revision=2638

1 files changed, 11 insertions, 0 deletions

diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index cc68ec9bc5..fbff51d728 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -398,6 +398,17 @@ e_text_destroy (GtkObject *object)
 	if (text->stipple)
 		gdk_bitmap_unref (text->stipple);
 
+	if (text->timeout_id) {
+		g_source_remove(text->timeout_id);
+		text->timeout_id = 0;
+	}
+	
+	if (text->timer) {
+		g_timer_stop(text->timer);
+		g_timer_destroy(text->timer);
+		text->timer = NULL;
+	}
+				
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }