If grabbed_item is NULL, cancel the timeout.

2002-05-10  Christopher James Lahey  <clahey@ximian.com>

	* gal/widgets/e-canvas.c (grab_cancelled_check): If grabbed_item
	is NULL, cancel the timeout.

svn path=/trunk/; revision=16760
This commit is contained in:
Christopher James Lahey
2002-05-10 22:00:03 +00:00
committed by Chris Lahey
parent ebed39b9e3
commit 091d3bbbf8

View File

@ -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) {