[goffice] Do not crash when deleting a grabbed item. [#609747]
- From: Jean Bréfort <jbrefort src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [goffice] Do not crash when deleting a grabbed item. [#609747]
- Date: Fri, 12 Feb 2010 15:08:26 +0000 (UTC)
commit e4ba24fcc6c3c0fab6a9061f949feed501994786
Author: Jean Brefort <jean brefort normalesup org>
Date: Fri Feb 12 16:00:55 2010 +0100
Do not crash when deleting a grabbed item. [#609747]
ChangeLog | 5 +++++
NEWS | 1 +
goffice/canvas/goc-item.c | 2 ++
3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 207dadf..1205a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-12 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/canvas/goc-item.c (goc_item_dispose): ungrab item on dispose
+ when needed. [#609747]
+
2010-02-11 Morten Welinder <terra gnome org>
* configure.in: Bump version number in preparation for release.
diff --git a/NEWS b/NEWS
index 0d47932..b163545 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ goffice 0.8.0:
Jean:
* Do not crash when a chart contains no plot. [#607960]
+ * Do not crash when deleting a grabbed item. [#609747]
Morten:
* Add "autoload" flag for plugins.
diff --git a/goffice/canvas/goc-item.c b/goffice/canvas/goc-item.c
index f4cc872..18e2f81 100644
--- a/goffice/canvas/goc-item.c
+++ b/goffice/canvas/goc-item.c
@@ -192,6 +192,8 @@ goc_item_dispose (GObject *object)
if (item->canvas) {
if (item->canvas->last_item == item)
item->canvas->last_item = NULL;
+ if (item->canvas->grabbed_item == item)
+ item->canvas->grabbed_item = NULL;
if (gtk_widget_is_realized (item->canvas)) {
item->cached_bounds = TRUE; /* avoids a call to update_bounds */
goc_item_invalidate (item);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]