summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tvb@src.gnome.org>2008-04-09 20:40:54 +0000
committerTristan Van Berkom <tvb@src.gnome.org>2008-04-09 20:40:54 +0000
commit1e2f5fb3af1b8ed5511b97476cdf66c232cd1ae0 (patch)
treed020ae0c46b6c723169926b3358334d78520af80
parent8aa2a06810a98a721787138a44844be2aba1f084 (diff)
downloadglade-GLADE3_3_5_2.tar.gz
Rolling 3.5.2. quick bugfix releaseGLADE3_3_5_2
* NEWS, configure.ac: Rolling 3.5.2. quick bugfix release * gladeui/glade-widget-adaptor.c: oops, was parsing booleans as doubles, fixed bugs with builder-unsupported and deprecated. svn path=/trunk/; revision=1786
-rw-r--r--ChangeLog7
-rw-r--r--NEWS6
-rw-r--r--configure.ac2
-rw-r--r--gladeui/glade-project.c24
-rw-r--r--gladeui/glade-widget-adaptor.c4
5 files changed, 29 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f5cc4d95..1ccbb309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-04-09 Tristan Van Berkom <tvb@gnome.org>
+ * NEWS, configure.ac: Rolling 3.5.2. quick bugfix release
+
+ * gladeui/glade-widget-adaptor.c: oops, was parsing booleans
+ as doubles, fixed bugs with builder-unsupported and deprecated.
+
+2008-04-09 Tristan Van Berkom <tvb@gnome.org>
+
* NEWS, configure.ac: Rolling 3.5.1.
* plugins/gtk+/gtk+.xml.in: Filled in all since, deprecated and
diff --git a/NEWS b/NEWS
index feaf2ef5..8d6832ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
===========
+Glade 3.5.2
+===========
+ - oops, was parsing booleans as doubles, fixed bugs with
+ builder-unsupported and deprecated.
+
+===========
Glade 3.5.1
===========
- Added versioning support, you can always chose the target version of
diff --git a/configure.ac b/configure.ac
index d7308910..a14c91d1 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, 5)
-m4_define(glade_micro_version, 1)
+m4_define(glade_micro_version, 2)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 0091624f..4abab8a3 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -2078,11 +2078,11 @@ glade_project_verify_dialog (GladeProject *project,
}
static void
-glade_project_verify_adaptor_supported (GladeProject *project,
- GladeWidgetAdaptor *adaptor,
- const gchar *path_name,
- GString *string,
- gboolean saving)
+glade_project_verify_adaptor (GladeProject *project,
+ GladeWidgetAdaptor *adaptor,
+ const gchar *path_name,
+ GString *string,
+ gboolean saving)
{
GladeWidgetAdaptor *adaptor_iter;
gint target_major, target_minor;
@@ -2111,15 +2111,17 @@ glade_project_verify_adaptor_supported (GladeProject *project,
GWA_BUILDER_UNSUPPORTED (adaptor_iter))
g_string_append_printf
(string,
- _("[%s] Object class '%s' of catalog '%s' is not supported "
+ _("[%s] Object class '%s' from %s %d.%d is not supported "
"by GtkBuilder\n"),
- path_name, adaptor_iter->title, catalog);
+ path_name, adaptor_iter->title, catalog,
+ target_major, target_minor);
if (!saving && GWA_DEPRECATED (adaptor_iter))
g_string_append_printf
(string,
- _("[%s] Object class '%s' of catalog '%s' is deprecated\n"),
- path_name, adaptor_iter->title, catalog);
+ _("[%s] Object class '%s' from %s %d.%d is deprecated\n"),
+ path_name, adaptor_iter->title, catalog,
+ target_major, target_minor);
g_free (catalog);
}
@@ -2143,8 +2145,8 @@ glade_project_verify (GladeProject *project,
path_name = glade_widget_generate_path_name (widget);
- glade_project_verify_adaptor_supported (project, widget->adaptor,
- path_name, string, saving);
+ glade_project_verify_adaptor (project, widget->adaptor,
+ path_name, string, saving);
glade_project_verify_properties (widget, path_name, string);
glade_project_verify_signals (widget, path_name, string);
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index 7053cd12..6687f9b0 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -1472,11 +1472,11 @@ gwa_derived_class_init (GladeWidgetAdaptorClass *adaptor_class,
&adaptor_class->version_since_minor);
adaptor_class->deprecated =
- glade_xml_get_property_double
+ glade_xml_get_property_boolean
(node, GLADE_TAG_DEPRECATED, adaptor_class->deprecated);
adaptor_class->builder_unsupported =
- glade_xml_get_property_double
+ glade_xml_get_property_boolean
(node, GLADE_TAG_BUILDER_UNSUPPORTED, adaptor_class->builder_unsupported);
adaptor_class->fixed =