diff options
author | Tristan Van Berkom <tvb@src.gnome.org> | 2008-05-05 16:38:43 +0000 |
---|---|---|
committer | Tristan Van Berkom <tvb@src.gnome.org> | 2008-05-05 16:38:43 +0000 |
commit | ed3df2e67f01aa2fa7b09ebdc2226867795518fb (patch) | |
tree | 0c82fd3019dd51fa9722b23fea5d6a4915a1ba99 | |
parent | b7b383e61a973f93f07b944fa303aad36dc2400e (diff) | |
download | glade-ed3df2e67f01aa2fa7b09ebdc2226867795518fb.tar.gz |
Rolling 3.4.5GLADE3_3_4_5
* NEWS, configure.ac: Rolling 3.4.5
* gladeui/glade-editor-property.c: Avoid feedback loops when committing properties,
fixes bug 527896.
* src/glade-window.c: Updated copyright dates.
svn path=/branches/gnome-2-22/; revision=1815
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/tmpl/glade-utils.sgml | 9 | ||||
-rw-r--r-- | doc/tmpl/gladeui-unused.sgml | 8 | ||||
-rw-r--r-- | gladeui/glade-editor-property.c | 4 | ||||
-rw-r--r-- | gladeui/glade-property-class.c | 2 | ||||
-rw-r--r-- | src/glade-window.c | 2 |
8 files changed, 30 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2008-05-05 Tristan Van Berkom <tvb@gnome.org> + + * NEWS, configure.ac: Rolling 3.4.5 + + * gladeui/glade-editor-property.c: Avoid feedback loops when committing properties, + fixes bug 527896. + + * src/glade-window.c: Updated copyright dates. + 2008-04-18 Tristan Van Berkom <tvb@gnome.org> * NEWS, configure.ac: Rolling 3.4.4 @@ -1,4 +1,9 @@ =========== +Glade 3.4.5 +=========== + - Fixed annoying text editing bug (527896). + +=========== Glade 3.4.4 =========== - Now first toplevel in project automatically shows up in diff --git a/configure.ac b/configure.ac index eccebe55..86b63c62 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.52) m4_define(glade_major_version, 3) m4_define(glade_minor_version, 4) -m4_define(glade_micro_version, 4) +m4_define(glade_micro_version, 5) m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version) AC_INIT([glade3], [glade_version], @@ -47,7 +47,7 @@ AM_PROG_LIBTOOL # If any interfaces have been added since the last public release, then increment GLADE_AGE. # If any interfaces have been removed since the last public release, then set GLADE_AGE to 0. # Reference: http://www.gnu.org/software/libtool/manual.html#Versioning -GLADE_REVISION=3 +GLADE_REVISION=4 GLADE_CURRENT=7 GLADE_AGE=0 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE` diff --git a/doc/tmpl/glade-utils.sgml b/doc/tmpl/glade-utils.sgml index 80b8558c..589258aa 100644 --- a/doc/tmpl/glade-utils.sgml +++ b/doc/tmpl/glade-utils.sgml @@ -36,15 +36,6 @@ glade-utils @GLADE_UI_ARE_YOU_SURE: @GLADE_UI_YES_OR_NO: -<!-- ##### FUNCTION glade_util_widget_set_tooltip ##### --> -<para> - -</para> - -@widget: -@str: - - <!-- ##### FUNCTION glade_util_get_type_from_name ##### --> <para> diff --git a/doc/tmpl/gladeui-unused.sgml b/doc/tmpl/gladeui-unused.sgml index b5019aa9..18e47054 100644 --- a/doc/tmpl/gladeui-unused.sgml +++ b/doc/tmpl/gladeui-unused.sgml @@ -91,3 +91,11 @@ GladeWidgetClass @window: +<!-- ##### FUNCTION glade_util_widget_set_tooltip ##### --> +<para> + +</para> + +@widget: +@str: + diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index be5f7703..fa1c83c0 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -142,6 +142,8 @@ glade_editor_property_commit (GladeEditorProperty *eprop, { g_return_if_fail (GLADE_IS_EDITOR_PROPERTY (eprop)); + g_signal_handler_block (G_OBJECT (eprop->property), eprop->changed_id); + if (eprop->use_command == FALSE) glade_property_set_value (eprop->property, value); else @@ -153,6 +155,8 @@ glade_editor_property_commit (GladeEditorProperty *eprop, if (glade_property_class_compare (eprop->property->klass, eprop->property->value, value) != 0) GLADE_EDITOR_PROPERTY_GET_CLASS (eprop)->load (eprop, eprop->property); + + g_signal_handler_unblock (G_OBJECT (eprop->property), eprop->changed_id); } diff --git a/gladeui/glade-property-class.c b/gladeui/glade-property-class.c index 3832a65a..029847ce 100644 --- a/gladeui/glade-property-class.c +++ b/gladeui/glade-property-class.c @@ -1836,7 +1836,7 @@ glade_property_class_compare (GladePropertyClass *klass, g_return_val_if_fail (GLADE_IS_PROPERTY_CLASS (klass), -1); /* GLib does not know how to compare a boxed real value */ - if (G_PARAM_SPEC_BOXED (klass->pspec)) + if (G_VALUE_HOLDS_BOXED (value1)) { gchar *val1, *val2; diff --git a/src/glade-window.c b/src/glade-window.c index 0f2b5e93..3af979f3 100644 --- a/src/glade-window.c +++ b/src/glade-window.c @@ -2111,7 +2111,7 @@ about_cb (GtkAction *action, GladeWindow *window) static const gchar copyright[] = "Copyright \xc2\xa9 2001-2006 Ximian, Inc.\n" "Copyright \xc2\xa9 2001-2006 Joaquin Cuenca Abela, Paolo Borelli, et al.\n" - "Copyright \xc2\xa9 2001-2006 Tristan Van Berkom, Juan Pablo Ugarte, et al."; + "Copyright \xc2\xa9 2001-2008 Tristan Van Berkom, Juan Pablo Ugarte, et al."; gtk_show_about_dialog (GTK_WINDOW (window), "name", g_get_application_name (), |