From 091d3bbbf8a5365501b83b1e26d9015b15402dcb Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 10 May 2002 22:00:03 +0000 Subject: If grabbed_item is NULL, cancel the timeout. 2002-05-10 Christopher James Lahey * gal/widgets/e-canvas.c (grab_cancelled_check): If grabbed_item is NULL, cancel the timeout. svn path=/trunk/; revision=16760 --- widgets/misc/e-canvas.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index e5b0b78bcd..b1d499f521 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -1091,6 +1091,14 @@ grab_cancelled_check (gpointer data) { ECanvas *canvas = data; + if (GNOME_CANVAS (canvas)->grabbed_item == NULL) { + canvas->grab_cancelled_cb = NULL; + canvas->grab_cancelled_check_id = 0; + canvas->grab_cancelled_time = 0; + canvas->grab_cancelled_data = NULL; + return FALSE; + } + if (gtk_grab_get_current ()) { gnome_canvas_item_ungrab(GNOME_CANVAS (canvas)->grabbed_item, canvas->grab_cancelled_time); if (canvas->grab_cancelled_cb) { -- cgit v1.2.3