aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/e-text
diff options
context:
space:
mode:
authorMatthew Loper <mloper@src.gnome.org>2000-04-27 03:28:22 +0800
committerMatthew Loper <mloper@src.gnome.org>2000-04-27 03:28:22 +0800
commit0ad8dad44a2c002f2da596ae886dea2a544ff061 (patch)
treea97a7e30d4c1ceffd5cfbd32eb269b01b1d3e3d8 /widgets/e-text
parent04195ce9da66c08ae991f29de8a0f797ad246ace (diff)
downloadgsoc2013-evolution-0ad8dad44a2c002f2da596ae886dea2a544ff061.tar.gz
gsoc2013-evolution-0ad8dad44a2c002f2da596ae886dea2a544ff061.tar.zst
gsoc2013-evolution-0ad8dad44a2c002f2da596ae886dea2a544ff061.zip
+ * 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
Diffstat (limited to 'widgets/e-text')
-rw-r--r--widgets/e-text/e-text.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/widgets/e-text/e-text.c b/widgets/e-text/e-text.c
index cc68ec9bc5..fbff51d728 100644
--- a/widgets/e-text/e-text.c
+++ b/widgets/e-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);
}