diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2008-03-09 20:14:39 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2008-03-09 20:14:39 +0000 |
| commit | 2f75bffd507bf2a2532f705b13c2859d3e56cede (patch) | |
| tree | 0170d46c9fe60d3e62ad8d29ae0b52ba5abe0d48 | |
| parent | c000917cef23fe2bdc45e43433680ceec11175c9 (diff) | |
| download | glade-2f75bffd507bf2a2532f705b13c2859d3e56cede.tar.gz | |
- Reset "events" property for newly created widgets (workaround for bug
* plugins/gtk+/glade-gtk.c:
- Reset "events" property for newly created widgets
(workaround for bug 472555).
* gladeui/glade-editor-property.c: added return_if_fail guard
as per bug 479468.
svn path=/trunk/; revision=1710
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gladeui/glade-editor-property.c | 2 | ||||
| -rw-r--r-- | plugins/gtk+/glade-gtk.c | 5 |
3 files changed, 14 insertions, 1 deletions
@@ -1,6 +1,12 @@ 2008-03-09 Tristan Van Berkom <tvb@gnome.org> - * plugins/gtk+/glade-gtk.c: Fixed a crash detail bug 493418. + * plugins/gtk+/glade-gtk.c: + - Fixed a crash detail bug 493418. + - Reset "events" property for newly created widgets + (workaround for bug 472555). + + * gladeui/glade-editor-property.c: added return_if_fail guard + as per bug 479468. 2008-02-16 Juan Pablo Ugarte <juanpablougarte@gmail.com> diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index 26657ebe..daa9499a 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -4037,6 +4037,8 @@ glade_editor_property_show_info (GladeEditorProperty *eprop) adaptor = glade_widget_adaptor_from_pspec (eprop->klass->pspec); + g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor)); + g_object_get (adaptor, "book", &book, NULL); if (eprop->klass->virt == FALSE && diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c index d187db2e..cf048c85 100644 --- a/plugins/gtk+/glade-gtk.c +++ b/plugins/gtk+/glade-gtk.c @@ -270,6 +270,11 @@ glade_gtk_widget_deep_post_create (GladeWidgetAdaptor *adaptor, GladeCreateReason reason) { GladeWidget *gwidget = glade_widget_get_from_gobject (widget); + + /* Work around bug 472555 by resetting the default event mask, + * this way only user edits will be saved to the glade file. */ + if (reason == GLADE_CREATE_USER) + glade_widget_property_reset (gwidget, "events"); glade_widget_set_action_sensitive (gwidget, "remove_parent", FALSE); |