[gnumeric] Fix grab issue after dragging an object. [debian bug #549559]



commit b3b2325915b2f2420f9a20fd1d8e68eb548d7782
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Sep 15 19:08:13 2009 +0200

    Fix grab issue after dragging an object. [debian bug #549559]

 ChangeLog                    |    6 ++++++
 NEWS                         |    3 +++
 src/gnm-pane.c               |    2 +-
 src/gnumeric-simple-canvas.c |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c6921df..01bb28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-15  Jean Brefort  <jean brefort normalesup org>
+
+	* src/gnm-pane.c (cb_pane_drag_end): correctly ungrab the item. Fixes
+	debian bug #546559.
+	* src/gnumeric-simple-canvas.c: typo.
+
 2009-09-12  Morten Welinder  <terra gnome org>
 
 	* src/rendered-value.c (gnm_rendered_value_new): Drop mstyle and
diff --git a/NEWS b/NEWS
index 6fe576c..58cd790 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.9.13
 
+Jean:
+	* Fix grab issue after dragging an object. [debian bug #549559]
+
 Morten:
 	* Fixes text export GUI issue.  [#594155]
 	* Fix minor status line issue.  [#594469]
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 5c69f7c..ee9fc6e 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -1079,7 +1079,7 @@ cb_pane_drag_end (GtkWidget *widget, GdkDragContext *context,
 	/* ungrab any grabbed item */
 	GocItem *item = goc_canvas_get_grabbed_item (GOC_CANVAS (source_pane));
 	if (item)
-		goc_item_ungrab (item);
+		gnm_simple_canvas_ungrab (item, gtk_get_current_event_time ());
 	/* sync the ctrl-pts with the object in case the drag was canceled. */
 	gnm_pane_objects_drag (source_pane, NULL,
 		source_pane->drag.origin_x,
diff --git a/src/gnumeric-simple-canvas.c b/src/gnumeric-simple-canvas.c
index d52b88b..fa0e136 100644
--- a/src/gnumeric-simple-canvas.c
+++ b/src/gnumeric-simple-canvas.c
@@ -60,7 +60,7 @@ gnm_simple_canvas_ungrab (GocItem *item, guint32 etime)
 	goc_item_ungrab (item);
 }
 
-/* FIXME this funtion has been simplfied a lot, if it really works like that
+/* FIXME this funtion has been simplified a lot, if it really works like that
  we should remove unused args and not return anything except void */
 int
 gnm_simple_canvas_grab (GocItem *item, unsigned int event_mask,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]