diff options
author | Christopher James Lahey <clahey@ximian.com> | 2001-12-17 15:50:20 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2001-12-17 15:50:20 +0800 |
commit | 4ca3db91acb3434149a3634cdefc27327d1cc53c (patch) | |
tree | 10553124d7763811863efe8485ad6395ae4ecf89 /widgets/misc | |
parent | 3c1dde46c314f0ba2fc02a779ac2c03f41f6b207 (diff) | |
download | gsoc2013-evolution-4ca3db91acb3434149a3634cdefc27327d1cc53c.tar.gz gsoc2013-evolution-4ca3db91acb3434149a3634cdefc27327d1cc53c.tar.zst gsoc2013-evolution-4ca3db91acb3434149a3634cdefc27327d1cc53c.zip |
Merging changes:
2001-12-11 Christopher James Lahey <clahey@ximian.com>
* gal/widgets/e-canvas.c (e_canvas_unrealize): Turn off idle
handling in the unrealize function instead of the destroy
function.
From gal/e-table/ChangeLog:
2001-12-11 Christopher James Lahey <clahey@ximian.com>
* e-table-item.c: Turn off idle handling in the unrealize function
instead of the destroy function.
svn path=/trunk/; revision=15102
Diffstat (limited to 'widgets/misc')
-rw-r--r-- | widgets/misc/e-canvas.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 8126367145..0b9c00261a 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -134,6 +134,7 @@ e_canvas_destroy (GtkObject *object) if (canvas->idle_id) g_source_remove(canvas->idle_id); + canvas->idle_id = 0; if (canvas->toplevel) { if (canvas->visibility_notify_id) @@ -736,6 +737,11 @@ static void e_canvas_unrealize (GtkWidget *widget) { ECanvas * ecanvas = E_CANVAS (widget); + + if (ecanvas->idle_id) + g_source_remove(ecanvas->idle_id); + ecanvas->idle_id = 0; + if (ecanvas->ic) { gdk_ic_destroy (ecanvas->ic); ecanvas->ic = NULL; |