Merge branch 'master' into p2p

diff --git a/NEWS b/NEWS
index 396a275..d571c8e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+What's new in at-spi2-atk 0.3.92:
+
+* Have value methods return 0 on failure rather than fail, as in original pyatspi
+
+What's new in at-spi2-atk 0.3.91.1:
+
+* Fi a build error introduced in 0.3.91.
+
 What's new in at-spi2-atk 0.3.91:
 
 * Default to --enable-relocate for now.

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
index 578e188..3cc3ef3 100644 (file)
--- a/atk-adaptor/Makefile.include
+++ b/atk-adaptor/Makefile.include
@@ -12,6 +12,7 @@ libatk_bridge_la_LDFLAGS = -no-undefined  \
                           -rpath $(gtkmoduledir)
 
 libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
+                         $(GMODULE_LIBS)       \
                          $(ATK_LIBS)       \
                          $(X_LIBS)         \
                          $(top_builddir)/droute/libdroute.la \

diff --git a/atk-adaptor/adaptors/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c
index 71214a8..b3bc550 100644 (file)
--- a/atk-adaptor/adaptors/value-adaptor.c
+++ b/atk-adaptor/adaptors/value-adaptor.c
@@ -60,7 +60,7 @@ impl_get_MaximumValue (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -70,12 +70,8 @@ impl_get_MaximumValue (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t
@@ -84,7 +80,7 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -94,12 +90,8 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t
@@ -108,7 +100,7 @@ impl_get_CurrentValue (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -118,12 +110,8 @@ impl_get_CurrentValue (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t

diff --git a/configure.ac b/configure.ac
index b4aef5b..b335c53 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.3.91], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [0.4.0], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0