Commit 61746a38 authored by Tristan Van Berkom's avatar Tristan Van Berkom

Fixed recursion in the eprops when updating values (due to exterior


	* gladeui/glade-editor-property.[ch]: Fixed recursion in the eprops when
	updating values (due to exterior callers calling ->load() when the project
	changes for thier custom editors), this fixes glitches when editing multiline
	text entries.


svn path=/trunk/; revision=2028
parent 2a1e6358
2008-11-15 Tristan Van Berkom <tvb@gnome.org>
* gladeui/glade-editor-property.[ch]: Fixed recursion in the eprops when
updating values (due to exterior callers calling ->load() when the project
changes for thier custom editors), this fixes glitches when editing multiline
text entries.
2008-11-12 Tristan Van Berkom <tvb@gnome.org>
* gladeui/glade-utils.c: Refixed use of uninitialized variable (bug 559678).
......
......@@ -123,7 +123,9 @@ glade_editor_property_commit_no_callback (GladeEditorProperty *eprop,
g_return_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop));
g_signal_handler_block (G_OBJECT (eprop->property), eprop->changed_id);
eprop->committing = TRUE;
glade_editor_property_commit (eprop, value);
eprop->committing = FALSE;
g_signal_handler_unblock (G_OBJECT (eprop->property), eprop->changed_id);
}
......@@ -1647,9 +1649,7 @@ glade_eprop_text_buffer_changed (GtkTextBuffer *buffer,
gtk_text_buffer_get_end_iter (buffer, &end);
text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
glade_eprop_text_changed_common (eprop, text, eprop->use_command);
g_free (text);
}
......@@ -3457,6 +3457,9 @@ glade_editor_property_load (GladeEditorProperty *eprop,
g_return_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop));
g_return_if_fail (property == NULL || GLADE_IS_PROPERTY (property));
if (eprop->committing)
return;
eprop->loading = TRUE;
GLADE_EDITOR_PROPERTY_GET_CLASS (eprop)->load (eprop, property);
eprop->loading = FALSE;
......
......@@ -109,6 +109,9 @@ struct _GladeEditorProperty
gboolean loading; /* True during glade_editor_property_load calls, this
* is used to avoid feedback from input widgets.
*/
gboolean committing; /* True while the editor property itself is applying
* the property with glade_editor_property_commit_no_callback ().
*/
gboolean use_command; /* Whether we should use the glade command interface
* or skip directly to GladeProperty interface.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment