Ensure that DBus errors are freed

Call dbus_error_free in some cases where it is needed. Just pass NULL to
dbus_message_get_args where we aren't using the error.

https://bugzilla.gnome.org/show_bug.cgi?id=698951

15 files changed, 78 insertions, 211 deletions

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index 76588be..64face9 100644
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -144,15 +144,13 @@ impl_GetChildAtIndex (DBusConnection * bus,
 {
   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 --git a/atk-adaptor/adaptors/action-adaptor.c b/atk-adaptor/adaptors/action-adaptor.c
index 7d9beab..ff28fdc 100644
--- a/atk-adaptor/adaptors/action-adaptor.c
+++ b/atk-adaptor/adaptors/action-adaptor.c
@@ -43,16 +43,14 @@ impl_get_description (DBusConnection * bus, DBusMessage * message,
                       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 @@ static DBusMessage *
 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 @@ static DBusMessage *
 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 @@ impl_get_keybinding (DBusConnection * bus, DBusMessage * message,
                      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 @@ static DBusMessage *
 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 --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
index dd6a4b3..8187cdf 100644
--- a/atk-adaptor/adaptors/component-adaptor.c
+++ b/atk-adaptor/adaptors/component-adaptor.c
@@ -36,16 +36,14 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
   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 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
   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 @@ static DBusMessage *
 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 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
                   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 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
   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 --git a/atk-adaptor/adaptors/document-adaptor.c b/atk-adaptor/adaptors/document-adaptor.c
index 5eacd38..062690a 100644
--- a/atk-adaptor/adaptors/document-adaptor.c
+++ b/atk-adaptor/adaptors/document-adaptor.c
@@ -55,16 +55,14 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message,
                         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 --git a/atk-adaptor/adaptors/editabletext-adaptor.c b/atk-adaptor/adaptors/editabletext-adaptor.c
index 1e0a5b9..a983fdc 100644
--- a/atk-adaptor/adaptors/editabletext-adaptor.c
+++ b/atk-adaptor/adaptors/editabletext-adaptor.c
@@ -35,14 +35,12 @@ impl_SetTextContents (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_InsertText (DBusConnection * bus, DBusMessage * message, void *user_data)
   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 @@ impl_CopyText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 @@ impl_CutText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 @@ impl_DeleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 @@ impl_PasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 --git a/atk-adaptor/adaptors/hyperlink-adaptor.c b/atk-adaptor/adaptors/hyperlink-adaptor.c
index 05eedb9..e397e1f 100644
--- a/atk-adaptor/adaptors/hyperlink-adaptor.c
+++ b/atk-adaptor/adaptors/hyperlink-adaptor.c
@@ -68,15 +68,13 @@ static DBusMessage *
 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 @@ impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 --git a/atk-adaptor/adaptors/hypertext-adaptor.c b/atk-adaptor/adaptors/hypertext-adaptor.c
index 6569eaa..80d0c52 100644
--- a/atk-adaptor/adaptors/hypertext-adaptor.c
+++ b/atk-adaptor/adaptors/hypertext-adaptor.c
@@ -53,15 +53,13 @@ static DBusMessage *
 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 @@ impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message,
                    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 --git a/atk-adaptor/adaptors/image-adaptor.c b/atk-adaptor/adaptors/image-adaptor.c
index 1ba1f4e..c28fd91 100644
--- a/atk-adaptor/adaptors/image-adaptor.c
+++ b/atk-adaptor/adaptors/image-adaptor.c
@@ -51,15 +51,13 @@ impl_GetImageExtents (DBusConnection * bus, DBusMessage * message,
                       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 @@ impl_GetImagePosition (DBusConnection * bus, DBusMessage * message,
                        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 @@ impl_GetImagePosition (DBusConnection * bus, DBusMessage * message,
 
   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 --git a/atk-adaptor/adaptors/selection-adaptor.c b/atk-adaptor/adaptors/selection-adaptor.c
index b39b22d..33c696d 100644
--- a/atk-adaptor/adaptors/selection-adaptor.c
+++ b/atk-adaptor/adaptors/selection-adaptor.c
@@ -54,15 +54,13 @@ impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_SelectChild (DBusConnection * bus, DBusMessage * message,
                   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 @@ impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message,
                             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 @@ impl_IsChildSelected (DBusConnection * bus, DBusMessage * message,
                       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 @@ impl_DeselectChild (DBusConnection * bus, DBusMessage * message,
                     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 @@ impl_DeselectChild (DBusConnection * bus, DBusMessage * message,
 
   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 --git a/atk-adaptor/adaptors/socket-adaptor.c b/atk-adaptor/adaptors/socket-adaptor.c
index 9aff7d7..ed6faa3 100644
--- a/atk-adaptor/adaptors/socket-adaptor.c
+++ b/atk-adaptor/adaptors/socket-adaptor.c
@@ -117,7 +117,7 @@ atspi_plug_component_get_position (AtkComponent *component, gint *x, gint *y,
   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 @@ atspi_plug_component_get_size (AtkComponent *component,
   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 --git a/atk-adaptor/adaptors/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c
index 8c334b6..9569c9d 100644
--- a/atk-adaptor/adaptors/table-adaptor.c
+++ b/atk-adaptor/adaptors/table-adaptor.c
@@ -96,14 +96,12 @@ impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
   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 @@ impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetColumnAtIndex (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetRowDescription (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetRowHeader (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_IsRowSelected (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   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 @@ impl_AddRowSelection (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
 {
   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 @@ impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
 
   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 --git a/atk-adaptor/adaptors/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c
index 5b48a18..f039d2e 100644
--- a/atk-adaptor/adaptors/text-adaptor.c
+++ b/atk-adaptor/adaptors/text-adaptor.c
@@ -67,14 +67,12 @@ impl_GetText (DBusConnection * bus, DBusMessage * message, void *user_data)
   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 @@ impl_SetCaretOffset (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message,
 
   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 @@ impl_GetAttributes (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetDefaultAttributes (DBusConnection * bus, DBusMessage * message,
                            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 @@ impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetOffsetAtPoint (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetSelection (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_AddSelection (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_RemoveSelection (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_SetSelection (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetRangeExtents (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message,
   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 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message,
 
   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 @@ static DBusMessage *
 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 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message,
 
   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 --git a/atk-adaptor/adaptors/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c
index 89f29ff..cf51014 100644
--- a/atk-adaptor/adaptors/value-adaptor.c
+++ b/atk-adaptor/adaptors/value-adaptor.c
@@ -156,7 +156,6 @@ impl_SetCurrentValue (DBusConnection * bus, DBusMessage * message,
 {
   AtkValue *value = (AtkValue *) user_data;
   dbus_bool_t rv;
-  DBusError error;
   DBusMessage *reply;
   gdouble dub = 0;
   GValue new_value = { 0 };
@@ -164,9 +163,8 @@ impl_SetCurrentValue (DBusConnection * bus, DBusMessage * message,
   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 --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index b016da6..1a36f14 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -274,11 +274,8 @@ register_application (SpiBridge * app)
 {
   DBusMessage *message;
   DBusMessageIter iter;
-  DBusError error;
   DBusPendingCall *pending;
 
-  dbus_error_init (&error);
-
   g_free (app->desktop_name);
   g_free (app->desktop_path);
 
@@ -320,11 +317,8 @@ deregister_application (SpiBridge * app)
 {
   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 +711,7 @@ spi_atk_create_socket (SpiBridge *app)
 {
 #ifndef DISABLE_P2P
   DBusServer *server;
-  DBusError err;
+  DBusError error;
 
   if (getuid () != 0)
   {
@@ -740,12 +734,12 @@ spi_atk_create_socket (SpiBridge *app)
   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 +943,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
   else
     get_registered_event_listeners (spi_global_app_data);
 
+  dbus_error_free (&error);
   return 0;
 }
 
diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index efd9c20..440d436 100644
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -140,7 +140,6 @@ Accessibility_DeviceEventController_NotifyListenersSync (const
                                                          * key_event)
 {
   DBusMessage *message;
-  DBusError error;
   dbus_bool_t consumed = FALSE;
 
   message =
@@ -149,7 +148,6 @@ Accessibility_DeviceEventController_NotifyListenersSync (const
                                   ATSPI_DBUS_INTERFACE_DEC,
                                   "NotifyListenersSync");
 
-  dbus_error_init (&error);
   if (spi_dbus_marshal_deviceEvent (message, key_event))
     {
       DBusMessage *reply =
@@ -158,8 +156,12 @@ Accessibility_DeviceEventController_NotifyListenersSync (const
         {
           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);
         }
     }