[gnumeric] Override edition-canceled property for GnmExprEntry. [#639287]

[Jean Bréfort <jbrefort src gnome org>]

commit e15ceaf3e7b42dab0f75793154a417e766c127bb
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Jan 12 15:50:23 2011 +0100

    Override edition-canceled property for GnmExprEntry. [#639287]

 NEWS                              |    1 +
 src/widgets/ChangeLog             |    5 +++++
 src/widgets/gnumeric-expr-entry.c |   13 ++++++++++++-
 3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index fa1783e..36c2313 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Jean:
 	* Fixed arrows and line object position when zoomed. [#637453]
 	* Fixed series lines color export to .xls. [#637658]
 	* Fixed sheet objects position on zoomed sheets. [#637739]
+	* Override edition-canceled property for GnmExprEntry. [#639287]
 
 Morten:
 	* Fix array intersection problem with IF.  [#633433]
diff --git a/src/widgets/ChangeLog b/src/widgets/ChangeLog
index 7eb1612..31cf77f 100644
--- a/src/widgets/ChangeLog
+++ b/src/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-12  Jean Brefort  <jean brefort normalesup org>
+
+	* gnumeric-expr-entry.c (gee_set_property), (gee_get_property),
+	(gee_class_init): override edition-canceled property. [#639287]
+
 2010-11-25  Morten Welinder <terra gnome org>
 
 	* Release 1.10.12
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 8f30018..1e2afd9 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -156,7 +156,8 @@ enum {
 	PROP_FLAGS,
 	PROP_SCG,
 	PROP_WBCG,
-	PROP_CONSTANT_FORMAT
+	PROP_CONSTANT_FORMAT,
+	PROP_EDITING_CANCELED
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -490,6 +491,8 @@ gee_set_property (GObject      *object,
 	case PROP_CONSTANT_FORMAT:
 		gee_set_format (gee, g_value_get_pointer (value));
 		break;
+	case PROP_EDITING_CANCELED:
+		gee->editing_canceled = g_value_get_boolean (value);
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 	}
@@ -524,6 +527,8 @@ gee_get_property (GObject      *object,
 	case PROP_CONSTANT_FORMAT:
 		g_value_set_pointer (value, (gpointer)gee->constant_format);
 		break;
+	case PROP_EDITING_CANCELED:
+		g_value_set_boolean (value, gee->editing_canceled);
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 	}
@@ -1520,6 +1525,12 @@ gee_class_init (GObjectClass *gobject_class)
 		g_cclosure_marshal_VOID__VOID,
 		G_TYPE_NONE, 0);
 
+
+#if GTK_CHECK_VERSION(2,20,0)
+	g_object_class_override_property
+		(gobject_class, PROP_EDITING_CANCELED, "editing-canceled");
+#endif
+
 	g_object_class_install_property
 		(gobject_class, PROP_UPDATE_POLICY,
 		 g_param_spec_enum ("update-policy",