Hello community, here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2013-06-29 19:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old) and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at-spi2-atk" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2013-04-26 15:36:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2013-06-29 19:36:34.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 21 19:07:47 UTC 2013 - dimstar@opensuse.org + +- Update to version 2.9.3: + + Fix reentrancy issues with gnome-shell (bgo#681276). + +------------------------------------------------------------------- +Tue May 28 19:51:22 UTC 2013 - dimstar@opensuse.org + +- Update to version 2.9.2: + + Fix various DBusError leaks (bgo#698951). + + Suppress a warning if an app returns NULL when referencing a + child. + +------------------------------------------------------------------- Old: ---- at-spi2-atk-2.8.1.tar.xz New: ---- at-spi2-atk-2.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-atk.spec ++++++ --- /var/tmp/diff_new_pack.hUiSlF/_old 2013-06-29 19:36:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hUiSlF/_new 2013-06-29 19:36:35.000000000 +0200 @@ -17,18 +17,18 @@ Name: at-spi2-atk -Version: 2.8.1 +Version: 2.9.3 Release: 0 Summary: Assistive Technology Service Provider Interface - GTK+ module License: LGPL-2.0+ Group: System/Libraries Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-atk/2.8/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/at-spi2-atk/2.9/%{name}-%{version}.tar.xz Source98: baselibs.conf Source99: %{name}-rpmlintrc BuildRequires: fdupes BuildRequires: pkgconfig(atk) >= 2.7.5 -BuildRequires: pkgconfig(atspi-2) >= 2.7.5 +BuildRequires: pkgconfig(atspi-2) >= 2.9.3 BuildRequires: pkgconfig(dbus-1) >= 1.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.0.0 ++++++ at-spi2-atk-2.8.1.tar.xz -> at-spi2-atk-2.9.3.tar.xz ++++++ ++++ 1979 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/NEWS new/at-spi2-atk-2.9.3/NEWS --- old/at-spi2-atk-2.8.1/NEWS 2013-04-17 03:16:32.000000000 +0200 +++ new/at-spi2-atk-2.9.3/NEWS 2013-06-17 23:02:02.000000000 +0200 @@ -1,8 +1,16 @@ -What's new in at-spi2-atk 2.8.1: +What's new in at-spi2-atk 2.9.3: -* Fix memory leak in socketadaptor.c (BGO#696733) +* Fix for BGO#681276 (reentrancy issues with gnome-shell). -* Fix a crash when handling a D-Bus method reply after deinitialization. +What's new in at-spi2-atk 2.9.2: + +* Fix a memory leak in the socket adaptor (BGO#696733). + +* Fix various DBusError leaks (BGO#698951). + +* Fix crash when a main loop is shut down repeatedly (BGO#699554). + +* Suppress a warning if an app returns NULL when referencing a child. What's new in at-spi2-atk 2.7.91: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c 2013-04-03 23:16:53.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -144,15 +144,13 @@ { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; - DBusError error; dbus_int32_t i; AtkObject *child; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_OBJECT (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -43,16 +43,14 @@ void *user_data) { AtkAction *action = (AtkAction *) user_data; - DBusError error; DBusMessage *reply; dbus_int32_t index; const char *desc; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -72,16 +70,14 @@ impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *name; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -101,16 +97,14 @@ impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *name; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -131,16 +125,14 @@ void *user_data) { DBusMessage *reply; - DBusError error; dbus_int32_t index; const char *kb; AtkAction *action = (AtkAction *) user_data; - dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -211,16 +203,14 @@ impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; - DBusError error; dbus_int32_t index; dbus_bool_t rv = TRUE; DBusMessage *reply; g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c 2013-06-15 22:48:01.000000000 +0200 @@ -110,7 +110,7 @@ reply = dbus_message_new_method_return(msg); if (reply) { - const char *retval = (g_getenv ("AT_SPI_CLIENT") ? + const char *retval = (atspi_is_initialized () ? "": spi_global_app_data->app_bus_addr); if (!retval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c 2013-05-20 23:24:46.000000000 +0200 @@ -154,8 +154,11 @@ AtkObject *child; child = atk_object_ref_accessible_child (obj, i); - spi_object_append_reference (&iter_sub_array, child); - g_object_unref (G_OBJECT (child)); + if (child) + { + spi_object_append_reference (&iter_sub_array, child); + g_object_unref (G_OBJECT (child)); + } } } if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -36,16 +36,14 @@ AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; dbus_uint32_t coord_type; - DBusError error; dbus_bool_t retval; DBusMessage *reply; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -69,15 +67,13 @@ dbus_int32_t x, y; dbus_uint32_t coord_type; DBusMessage *reply; - DBusError error; AtkObject *child; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -96,16 +92,14 @@ impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix, iy, iwidth, iheight; g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -119,7 +113,6 @@ void *user_data) { AtkComponent *component = (AtkComponent *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix = 0, iy = 0; dbus_int32_t x, y; @@ -128,9 +121,8 @@ g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -55,16 +55,14 @@ void *user_data) { AtkDocument *document = (AtkDocument *) user_data; - DBusError error; gchar *attributename; const gchar *atr; DBusMessage *reply; g_return_val_if_fail (ATK_IS_DOCUMENT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -35,14 +35,12 @@ AtkEditableText *editable = (AtkEditableText *) user_data; const char *newContents; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -65,15 +63,13 @@ dbus_int32_t position, length; char *text; dbus_bool_t rv; - DBusError error; DBusMessage *reply; gint ip; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, + (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -96,13 +92,11 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -116,15 +110,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -146,15 +138,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -176,15 +166,13 @@ { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t position; - DBusError error; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -68,15 +68,13 @@ impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); - DBusError error; dbus_int32_t i; AtkObject *atk_object; g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -89,15 +87,13 @@ { AtkHyperlink *link = get_hyperlink (user_data); dbus_int32_t i; - DBusError error; gchar *rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -53,15 +53,13 @@ impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; - DBusError error; dbus_int32_t linkIndex; AtkHyperlink *link; g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -77,16 +75,14 @@ void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; - DBusError error; dbus_int32_t characterIndex; dbus_int32_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -51,15 +51,13 @@ void *user_data) { AtkImage *image = (AtkImage *) user_data; - DBusError error; dbus_uint32_t coordType; gint ix, iy, iwidth, iheight; g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -73,7 +71,6 @@ void *user_data) { AtkImage *image = (AtkImage *) user_data; - DBusError error; dbus_uint32_t coord_type; gint ix = 0, iy = 0; dbus_int32_t x, y; @@ -81,9 +78,8 @@ g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -54,15 +54,13 @@ { AtkSelection *selection = (AtkSelection *) user_data; DBusMessage *reply; - DBusError error; dbus_int32_t selectedChildIndex; AtkObject *atk_object; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -80,16 +78,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t childIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -108,16 +104,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t selectedChildIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -137,16 +131,14 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t childIndex; dbus_bool_t rv; DBusMessage *reply; g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -204,7 +196,6 @@ void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; - DBusError error; dbus_int32_t selectedChildIndex; dbus_bool_t rv = FALSE; gint i, nselected; @@ -212,9 +203,8 @@ g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, + (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c 2013-04-03 23:16:53.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -117,7 +117,7 @@ dbus_message_unref (message); if (!reply) return; - if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &x_dbus, + if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &x_dbus, DBUS_TYPE_INT32, &y_dbus, DBUS_TYPE_INVALID)) { g_warning ("GetPosition failed: %s", error.message); @@ -146,7 +146,7 @@ dbus_message_unref (message); if (!reply) return; - if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &width_dbus, + if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &width_dbus, DBUS_TYPE_INT32, &height_dbus, DBUS_TYPE_INVALID)) { g_warning ("GetSize failed: %s", error.message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -96,14 +96,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; DBusMessage *reply; - DBusError error; AtkObject *obj; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -122,14 +120,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t index; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -151,14 +147,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; dbus_int32_t row; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -179,14 +173,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; dbus_int32_t column; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -220,14 +212,12 @@ dbus_int32_t row; AtkTable *table = (AtkTable *) user_data; const gchar *description; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -249,14 +239,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; const char *description; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -278,14 +266,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t extent; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -307,14 +293,12 @@ AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; dbus_int32_t extent; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -335,14 +319,12 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; AtkObject *obj = NULL; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -356,14 +338,12 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; AtkObject *obj; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -429,15 +409,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -457,15 +435,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -484,15 +460,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -513,15 +487,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -541,15 +513,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -569,15 +539,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -597,15 +565,13 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; - DBusError error; DBusMessage *reply; dbus_bool_t ret; g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -625,7 +591,6 @@ { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; - DBusError error; dbus_int32_t row, column, row_extents, col_extents; dbus_bool_t is_selected; dbus_bool_t ret; @@ -635,9 +600,8 @@ g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -67,14 +67,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; gchar *txt; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -98,14 +96,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -129,14 +125,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -168,14 +162,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -208,14 +200,12 @@ gchar *txt; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -245,14 +235,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_int32_t ch; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -277,7 +265,6 @@ dbus_bool_t defined; gint intstart_offset = 0, intend_offset = 0; char *rv = NULL; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; GSList *cur_attr; @@ -285,9 +272,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, &attributeName, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -332,16 +318,14 @@ dbus_int32_t offset; dbus_int32_t startOffset, endOffset; gint intstart_offset, intend_offset; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; DBusMessageIter iter; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -369,14 +353,12 @@ void *user_data) { AtkText *text = (AtkText *) user_data; - DBusError error; DBusMessage *reply; AtkAttributeSet *set; DBusMessageIter iter; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); set = atk_text_get_default_attributes (text); reply = dbus_message_new_method_return (message); @@ -398,14 +380,12 @@ dbus_uint32_t coordType; dbus_int32_t x, y, width, height; gint ix = 0, iy = 0, iw = 0, ih = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -434,14 +414,12 @@ dbus_int32_t x, y; dbus_uint32_t coordType; dbus_int32_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -484,14 +462,12 @@ dbus_int32_t selectionNum; dbus_int32_t startOffset, endOffset; gint intstart_offset = 0, intend_offset = 0; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -517,14 +493,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -546,14 +520,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -574,14 +546,12 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum, startOffset, endOffset; dbus_bool_t rv; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -605,14 +575,12 @@ dbus_uint32_t coordType; AtkTextRectangle rect; dbus_int32_t x, y, width, height; - DBusError error; DBusMessage *reply; g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -643,7 +611,6 @@ AtkText *text = (AtkText *) user_data; dbus_int32_t x, y, width, height; dbus_uint32_t coordType, xClipType, yClipType; - DBusError error; AtkTextRange **range_list = NULL; AtkTextRectangle rect; DBusMessage *reply; @@ -651,9 +618,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType, DBUS_TYPE_INVALID)) @@ -713,7 +679,6 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, void *user_data) { - DBusError error; AtkText *text = (AtkText *) user_data; dbus_int32_t offset; dbus_bool_t includeDefaults; @@ -725,9 +690,8 @@ g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, + (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, &includeDefaults, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c --- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c 2013-05-14 19:50:48.000000000 +0200 @@ -156,7 +156,6 @@ { AtkValue *value = (AtkValue *) user_data; dbus_bool_t rv; - DBusError error; DBusMessage *reply; gdouble dub = 0; GValue new_value = { 0 }; @@ -164,9 +163,8 @@ g_return_val_if_fail (ATK_IS_VALUE (value), droute_not_yet_handled_error (message)); - dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) + (message, NULL, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c --- old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c 2013-04-17 03:16:18.000000000 +0200 +++ new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c 2013-05-14 19:50:48.000000000 +0200 @@ -235,6 +235,14 @@ reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); + + if (!spi_global_app_data) + { + if (reply) + dbus_message_unref (reply); + return; + } + if (reply) { gchar *app_name, *obj_path; @@ -274,11 +282,8 @@ { DBusMessage *message; DBusMessageIter iter; - DBusError error; DBusPendingCall *pending; - dbus_error_init (&error); - g_free (app->desktop_name); g_free (app->desktop_path); @@ -320,11 +325,8 @@ { DBusMessage *message; DBusMessageIter iter; - DBusError error; const char *uname; - dbus_error_init (&error); - message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_REGISTRY, ATSPI_DBUS_INTERFACE_REGISTRY, @@ -717,7 +719,7 @@ { #ifndef DISABLE_P2P DBusServer *server; - DBusError err; + DBusError error; if (getuid () != 0) { @@ -740,12 +742,12 @@ if (!spi_global_app_data->app_bus_addr) return -1; - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + dbus_error_init(&error); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error); if (server == NULL) { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); - dbus_error_init (&err); + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message); + dbus_error_free (&error); spi_global_app_data->app_bus_addr [0] = '\0'; g_main_context_unref (spi_global_app_data->main_context); spi_global_app_data->main_context = NULL; @@ -949,6 +951,7 @@ else get_registered_event_listeners (spi_global_app_data); + dbus_error_free (&error); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/event.c new/at-spi2-atk-2.9.3/atk-adaptor/event.c --- old/at-spi2-atk-2.8.1/atk-adaptor/event.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/atk-adaptor/event.c 2013-06-16 20:58:00.000000000 +0200 @@ -98,15 +98,12 @@ { DBusPendingCall *pending; SpiReentrantCallClosure closure; - GMainContext *main_context; GSource *source; - main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL : - spi_global_app_data->main_context); closure.bus = bus; - closure.loop = g_main_loop_new (main_context, FALSE); + closure.loop = g_main_loop_new (spi_global_app_data->main_context, FALSE); closure.reply = NULL; - switch_main_context (main_context); + switch_main_context (spi_global_app_data->main_context); if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending) { @@ -116,7 +113,7 @@ dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL); source = g_timeout_source_new (500); g_source_set_callback (source, timeout_reply, &closure, NULL); - closure.timeout = g_source_attach (source, main_context); + closure.timeout = g_source_attach (source, spi_global_app_data->main_context); g_source_unref (source); g_main_loop_run (closure.loop); if (closure.timeout != -1) @@ -140,7 +137,6 @@ * key_event) { DBusMessage *message; - DBusError error; dbus_bool_t consumed = FALSE; message = @@ -149,7 +145,6 @@ ATSPI_DBUS_INTERFACE_DEC, "NotifyListenersSync"); - dbus_error_init (&error); if (spi_dbus_marshal_deviceEvent (message, key_event)) { DBusMessage *reply = @@ -158,8 +153,12 @@ { DBusError error; dbus_error_init (&error); - dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed, - DBUS_TYPE_INVALID); + if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, + &consumed, DBUS_TYPE_INVALID)) + { + /* TODO: print a warning */ + dbus_error_free (&error); + } dbus_message_unref (reply); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/configure.ac new/at-spi2-atk-2.9.3/configure.ac --- old/at-spi2-atk-2.8.1/configure.ac 2013-04-17 03:16:32.000000000 +0200 +++ new/at-spi2-atk-2.9.3/configure.ac 2013-06-17 23:29:38.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [2.8.1], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-atk], [2.9.3], [accessibility-atspi@lists.linux-foundation.org]) AC_CONFIG_AUX_DIR(config) AT_SPI_ATK_MAJOR_VERSION=0 @@ -55,7 +55,7 @@ AC_SUBST(ATK_LIBS) AC_SUBST(ATK_CFLAGS) -PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.7.5]) +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.9.3]) AC_SUBST(ATSPI_LIBS) AC_SUBST(ATSPI_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/droute/droute.c new/at-spi2-atk-2.9.3/droute/droute.c --- old/at-spi2-atk-2.8.1/droute/droute.c 2012-12-17 19:52:09.000000000 +0100 +++ new/at-spi2-atk-2.9.3/droute/droute.c 2013-05-14 19:50:48.000000000 +0200 @@ -265,7 +265,12 @@ dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID)) - return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + return ret; + } reply = dbus_message_new_method_return (message); if (!reply) @@ -321,17 +326,26 @@ DBUS_TYPE_STRING, &(pair.two), DBUS_TYPE_INVALID)) - return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + } _DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr); prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair); if (!prop_funcs) + { + DBusMessage *ret; #ifdef DBUS_ERROR_UNKNOWN_PROPERTY - return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); + ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); #else - return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); #endif + dbus_error_free (&error); + return ret; + } datum = path_get_datum (path, pathstr); if (!datum) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org