diff options
author | Mike Gorse <mgorse@suse.com> | 2013-04-30 14:12:05 -0500 |
---|---|---|
committer | Mike Gorse <mgorse@suse.com> | 2013-04-30 14:12:05 -0500 |
commit | 5515673936c5fa9af85e133ed070349db5fb098a (patch) | |
tree | 66dcfc8641f4f0ca18cbf23242e14eb76dad6d00 /atk-adaptor/adaptors/editabletext-adaptor.c | |
parent | 5de2b2bc9c83045a6870e13cd20bc3c2c0a1121f (diff) | |
download | at-spi2-atk-5515673936c5fa9af85e133ed070349db5fb098a.tar.gz |
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
Diffstat (limited to 'atk-adaptor/adaptors/editabletext-adaptor.c')
-rw-r--r-- | atk-adaptor/adaptors/editabletext-adaptor.c | 24 |
1 files changed, 6 insertions, 18 deletions
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); } |