goffice r2231 - in trunk: . goffice/cut-n-paste/foocanvas

[jody svn gnome org]

Author: jody
Date: Thu Oct  9 21:27:33 2008
New Revision: 2231
URL: http://svn.gnome.org/viewvc/goffice?rev=2231&view=rev

Log:
2008-10-08  Jody Goldberg <jody gnome org>

	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
	  simplistic patch to repair gtk-2.14 related breakage.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Oct  9 21:27:33 2008
@@ -8,6 +8,9 @@
 	* Implement probability plots for some common distributions. [#500168]
 	* Fix invalid write in gog_probability_plot_series_update. [#555161]
 
+Jody:
+	* Patch foocanvas to work around behaviour change in gtk 2.14.
+
 Morten:
 	* Fix go_url_resolve_relative.  [#550898]
 

Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c	(original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c	Thu Oct  9 21:27:33 2008
@@ -2815,7 +2815,8 @@
 
 	canvas = FOO_CANVAS (widget);
 
-	if (event->window != canvas->layout.bin_window)
+	if (event->window != canvas->layout.bin_window ||
+	    NULL != canvas->grabbed_item)
 		return FALSE;
 
 	canvas->state = event->state;