diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2002-05-11 06:00:03 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2002-05-11 06:00:03 +0800 |
| commit | 091d3bbbf8a5365501b83b1e26d9015b15402dcb (patch) | |
| tree | f0e9e0f65a2b8b1338fd672b26c0af9ee3cb74ef | |
| parent | ebed39b9e394c8495c07073b930015ff6288972d (diff) | |
| download | gsoc2013-evolution-091d3bbbf8a5365501b83b1e26d9015b15402dcb.tar.gz gsoc2013-evolution-091d3bbbf8a5365501b83b1e26d9015b15402dcb.tar.zst gsoc2013-evolution-091d3bbbf8a5365501b83b1e26d9015b15402dcb.zip | |
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
| -rw-r--r-- | widgets/misc/e-canvas.c | 8 |
1 files changed, 8 insertions, 0 deletions
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) { |