From: Mark Doffman Date: Mon, 9 Feb 2009 14:37:37 +0000 (+0000) Subject: 2009-02-9 Mark Doffman X-Git-Tag: AT_SPI2_CORE_0_1_3~91 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2db1353c28700fa75c8fa11a6d660046c189a151;p=platform%2Fupstream%2Fat-spi2-core.git 2009-02-9 Mark Doffman Attempt to reduce the size of the spi-common library. Move some of the error functions out to droute library. --- diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/action-adaptor.c index e9da657..b26a768 100644 --- a/atk-adaptor/action-adaptor.c +++ b/atk-adaptor/action-adaptor.c @@ -50,7 +50,7 @@ impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data droute_not_yet_handled_error (message)); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } desc = atk_action_get_description(action, index); if (!desc) desc = ""; @@ -76,7 +76,7 @@ impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) droute_not_yet_handled_error (message)); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } name = atk_action_get_name(action, index); if (!name) name = ""; @@ -102,7 +102,7 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) droute_not_yet_handled_error (message)); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } kb = atk_action_get_keybinding(action, index); if (!kb) kb = ""; @@ -167,7 +167,7 @@ static DBusMessage *impl_doAction(DBusConnection *bus, DBusMessage *message, voi if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_action_do_action(action, index); reply = dbus_message_new_method_return (message); diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/component-adaptor.c index 25e44c2..d51c5fb 100644 --- a/atk-adaptor/component-adaptor.c +++ b/atk-adaptor/component-adaptor.c @@ -46,7 +46,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } retval = atk_component_contains (component, x, y, (AtkCoordType) coord_type); @@ -54,14 +54,14 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; @@ -77,11 +77,11 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } child = atk_component_ref_accessible_at_point (component, x, y, - (AtkCoordType) coord_type); + (AtkCoordType) coord_type); return spi_dbus_return_object (message, child, TRUE); } @@ -100,16 +100,16 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data) if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_component_get_extents (component, &ix, &iy, &iwidth, &iheight, - (AtkCoordType) coord_type); + (AtkCoordType) coord_type); return spi_dbus_return_rect (message, ix, iy, iwidth, iheight); } static DBusMessage * impl_getPosition (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkComponent *component = (AtkComponent *) user_data; DBusError error; @@ -125,7 +125,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_component_get_position (component, &ix, &iy, (AtkCoordType) coord_type); x = ix; @@ -134,7 +134,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, - &y, DBUS_TYPE_INVALID); + &y, DBUS_TYPE_INVALID); } return reply; } @@ -157,7 +157,7 @@ impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &width, - DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID); } return reply; } @@ -206,14 +206,14 @@ impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int16_t rv; @@ -246,7 +246,7 @@ impl_grabFocus (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -254,13 +254,13 @@ impl_grabFocus (DBusConnection * bus, DBusMessage * message, void *user_data) #if 0 static DBusMessage * impl_registerFocusHandler (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { } static DBusMessage * impl_deregisterFocusHandler (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { } #endif @@ -280,7 +280,7 @@ impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_DOUBLE, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/document-adaptor.c index 91f6313..d99d0e9 100644 --- a/atk-adaptor/document-adaptor.c +++ b/atk-adaptor/document-adaptor.c @@ -45,14 +45,14 @@ impl_getLocale (DBusConnection *bus, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &lc, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkDocument *document = (AtkDocument *) user_data; DBusError error; @@ -66,7 +66,7 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atr = atk_document_get_attribute_value (document, attributename); if (!atr) @@ -75,14 +75,14 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &atr, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkDocument *document = (AtkDocument *) user_data; DBusMessage *reply; @@ -112,7 +112,7 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, - &retval, n_attributes, DBUS_TYPE_INVALID); + &retval, n_attributes, DBUS_TYPE_INVALID); } for (i = 0; i < n_attributes; i++) g_free (retval[i]); diff --git a/atk-adaptor/editabletext-adaptor.c b/atk-adaptor/editabletext-adaptor.c index 76a8866..ce0f8e3 100644 --- a/atk-adaptor/editabletext-adaptor.c +++ b/atk-adaptor/editabletext-adaptor.c @@ -29,7 +29,7 @@ static DBusMessage * impl_setTextContents (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; const char *newContents; @@ -43,7 +43,7 @@ impl_setTextContents (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_editable_text_set_text_contents (editable, newContents); rv = TRUE; @@ -52,7 +52,7 @@ impl_setTextContents (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -75,7 +75,7 @@ impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ip = position; atk_editable_text_insert_text (editable, text, length, &ip); @@ -85,14 +85,14 @@ impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_setAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; const char *attributes; @@ -108,7 +108,7 @@ impl_setAttributes (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_STRING, &attributes, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } // TODO implement rv = FALSE; @@ -116,7 +116,7 @@ impl_setAttributes (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -135,7 +135,7 @@ impl_copyText (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_editable_text_copy_text (editable, startPos, endPos); return NULL; @@ -157,7 +157,7 @@ impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_editable_text_cut_text (editable, startPos, endPos); rv = TRUE; @@ -166,7 +166,7 @@ impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -187,7 +187,7 @@ impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_editable_text_delete_text (editable, startPos, endPos); rv = TRUE; @@ -196,7 +196,7 @@ impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -216,7 +216,7 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data) if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_editable_text_paste_text (editable, position); rv = TRUE; @@ -225,7 +225,7 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/hyperlink-adaptor.c b/atk-adaptor/hyperlink-adaptor.c index 9634512..98ae486 100644 --- a/atk-adaptor/hyperlink-adaptor.c +++ b/atk-adaptor/hyperlink-adaptor.c @@ -39,7 +39,7 @@ impl_get_nAnchors (DBusMessageIter * iter, void *user_data) static dbus_bool_t impl_get_startIndex (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkHyperlink *link = (AtkHyperlink *) user_data; g_return_val_if_fail (ATK_IS_HYPERLINK (user_data), FALSE); @@ -68,7 +68,7 @@ impl_getObject (DBusConnection * bus, DBusMessage * message, void *user_data) if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_object = atk_hyperlink_get_object (link, i); return spi_dbus_return_object (message, atk_object, FALSE); @@ -90,7 +90,7 @@ impl_getURI (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_hyperlink_get_uri (link, i); @@ -100,7 +100,7 @@ impl_getURI (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } g_free (rv); return reply; @@ -121,7 +121,7 @@ impl_isValid (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/hypertext-adaptor.c index a1c2298..01431bf 100644 --- a/atk-adaptor/hypertext-adaptor.c +++ b/atk-adaptor/hypertext-adaptor.c @@ -41,7 +41,7 @@ impl_getNLinks (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -60,7 +60,7 @@ impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data) if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } link = atk_hypertext_get_link (hypertext, linkIndex); return spi_dbus_return_object (message, ATK_OBJECT (link), FALSE); @@ -68,7 +68,7 @@ impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data) static DBusMessage * impl_getLinkIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; DBusError error; @@ -82,14 +82,14 @@ impl_getLinkIndex (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_hypertext_get_link_index (hypertext, characterIndex); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/image-adaptor.c index 23bf365..7e6143e 100644 --- a/atk-adaptor/image-adaptor.c +++ b/atk-adaptor/image-adaptor.c @@ -29,17 +29,17 @@ static dbus_bool_t impl_get_imageDescription (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkImage *image = (AtkImage *) user_data; g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE); return droute_return_v_string (iter, - atk_image_get_image_description (image)); + atk_image_get_image_description (image)); } static dbus_bool_t impl_get_imageLocale (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkImage *image = (AtkImage *) user_data; g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE); @@ -48,7 +48,7 @@ impl_get_imageLocale (DBusMessageIter * iter, static DBusMessage * impl_getImageExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkImage *image = (AtkImage *) user_data; DBusError error; @@ -61,7 +61,7 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_image_get_image_size (image, &iwidth, &iheight); atk_image_get_image_position (image, &ix, &iy, (AtkCoordType) coordType); @@ -70,7 +70,7 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getImagePosition (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkImage *image = (AtkImage *) user_data; DBusError error; @@ -85,7 +85,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_image_get_image_position (image, &ix, &iy, (AtkCoordType) coord_type); x = ix; @@ -94,14 +94,14 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, - &y, DBUS_TYPE_INVALID); + &y, DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getImageSize (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkImage *image = (AtkImage *) user_data; gint iwidth = 0, iheight = 0; @@ -117,7 +117,7 @@ impl_getImageSize (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &width, - DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c index 3cae386..c348655 100644 --- a/atk-adaptor/selection-adaptor.c +++ b/atk-adaptor/selection-adaptor.c @@ -29,13 +29,13 @@ static dbus_bool_t impl_get_nSelectedChildren (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE); return droute_return_v_int32 (iter, - atk_selection_get_selection_count - (selection)); + atk_selection_get_selection_count + (selection)); } /*static char * @@ -43,13 +43,13 @@ impl_get_nSelectedChildren_str (void *datum) { g_assert (ATK_IS_HYPERLINK (datum)); return g_strdup_printf ("%d", - atk_selection_get_selection_count ((AtkSelection *) - datum)); + atk_selection_get_selection_count ((AtkSelection *) + datum)); }*/ static DBusMessage * impl_getSelectedChild (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusError error; @@ -63,7 +63,7 @@ impl_getSelectedChild (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_object = atk_selection_ref_selection (selection, selectedChildIndex); return spi_dbus_return_object (message, atk_object, TRUE); @@ -71,7 +71,7 @@ impl_getSelectedChild (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_selectChild (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusError error; @@ -85,21 +85,21 @@ impl_selectChild (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_selection_add_selection (selection, childIndex); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusError error; @@ -114,21 +114,21 @@ impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_selection_remove_selection (selection, selectedChildIndex); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_isChildSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusError error; @@ -142,14 +142,14 @@ impl_isChildSelected (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_selection_is_child_selected (selection, childIndex); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -168,14 +168,14 @@ impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_clearSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_bool_t rv; @@ -188,14 +188,14 @@ impl_clearSelection (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_deselectChild (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusError error; @@ -211,25 +211,25 @@ impl_deselectChild (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &selectedChildIndex, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } nselected = atk_selection_get_selection_count (selection); for (i = 0; i < nselected; ++i) { AtkObject *selected_obj = atk_selection_ref_selection (selection, i); if (atk_object_get_index_in_parent (selected_obj) == selectedChildIndex) - { - g_object_unref (G_OBJECT (selected_obj)); - rv = atk_selection_remove_selection (selection, i); - break; - } + { + g_object_unref (G_OBJECT (selected_obj)); + rv = atk_selection_remove_selection (selection, i); + break; + } g_object_unref (G_OBJECT (selected_obj)); } reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/table-adaptor.c b/atk-adaptor/table-adaptor.c index cc8cfbe..7ba03f2 100644 --- a/atk-adaptor/table-adaptor.c +++ b/atk-adaptor/table-adaptor.c @@ -50,7 +50,7 @@ impl_get_caption (DBusMessageIter * iter, void *user_data) AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); return spi_dbus_return_v_object (iter, atk_table_get_caption (table), - FALSE); + FALSE); } static dbus_bool_t @@ -59,12 +59,12 @@ impl_get_summary (DBusMessageIter * iter, void *user_data) AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); return spi_dbus_return_v_object (iter, atk_table_get_summary (table), - FALSE); + FALSE); } static dbus_bool_t impl_get_nSelectedRows (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_rows = NULL; @@ -78,7 +78,7 @@ impl_get_nSelectedRows (DBusMessageIter * iter, static dbus_bool_t impl_get_nSelectedColumns (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_columns = NULL; @@ -92,7 +92,7 @@ impl_get_nSelectedColumns (DBusMessageIter * iter, static DBusMessage * impl_getAccessibleAt (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -106,7 +106,7 @@ impl_getAccessibleAt (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } obj = atk_table_ref_at (table, row, column); return spi_dbus_return_object (message, obj, TRUE); @@ -128,21 +128,21 @@ impl_getIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } index = atk_table_get_index_at (table, row, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &index, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRowAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -156,21 +156,21 @@ impl_getRowAtIndex (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } row = atk_table_get_row_at_index (table, index); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &row, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getColumnAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -184,21 +184,21 @@ impl_getColumnAtIndex (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } column = atk_table_get_column_at_index (table, index); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRowDescription (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { dbus_int32_t row; AtkTable *table = (AtkTable *) user_data; @@ -212,7 +212,7 @@ impl_getRowDescription (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } description = atk_table_get_row_description (table, row); if (!description) @@ -221,14 +221,14 @@ impl_getRowDescription (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &description, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getColumnDescription (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -242,7 +242,7 @@ impl_getColumnDescription (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } description = atk_table_get_column_description (table, column); if (!description) @@ -251,14 +251,14 @@ impl_getColumnDescription (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &description, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRowExtentAt (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -273,21 +273,21 @@ impl_getRowExtentAt (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } extent = atk_table_get_row_extent_at (table, row, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &extent, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getColumnExtentAt (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -302,21 +302,21 @@ impl_getColumnExtentAt (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } extent = atk_table_get_column_extent_at (table, row, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &extent, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRowHeader (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -329,7 +329,7 @@ impl_getRowHeader (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } obj = atk_table_get_row_header (table, row); return spi_dbus_return_object (message, obj, FALSE); @@ -337,7 +337,7 @@ impl_getRowHeader (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getColumnHeader (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -350,7 +350,7 @@ impl_getColumnHeader (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } obj = atk_table_get_column_header (table, column); return spi_dbus_return_object (message, obj, FALSE); @@ -358,7 +358,7 @@ impl_getColumnHeader (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getSelectedRows (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_rows = NULL; @@ -375,7 +375,7 @@ impl_getSelectedRows (DBusConnection * bus, DBusMessage * message, { /* tbd - figure out if this is safe for a 0-length array */ dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_INT32, - &selected_rows, count, DBUS_TYPE_INVALID); + &selected_rows, count, DBUS_TYPE_INVALID); } if (selected_rows) g_free (selected_rows); @@ -384,7 +384,7 @@ impl_getSelectedRows (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_columns = NULL; @@ -401,7 +401,7 @@ impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message, { /* tbd - figure out if this is safe for a 0-length array */ dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_INT32, - &selected_columns, count, DBUS_TYPE_INVALID); + &selected_columns, count, DBUS_TYPE_INVALID); } if (selected_columns) g_free (selected_columns); @@ -410,7 +410,7 @@ impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_isRowSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -424,21 +424,21 @@ impl_isRowSelected (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_is_row_selected (table, row); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_isColumnSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -452,14 +452,14 @@ impl_isColumnSelected (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_is_column_selected (table, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -480,21 +480,21 @@ impl_isSelected (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_is_selected (table, row, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_addRowSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -508,21 +508,21 @@ impl_addRowSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_add_row_selection (table, row); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_addColumnSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -536,21 +536,21 @@ impl_addColumnSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_add_column_selection (table, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_removeRowSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -564,21 +564,21 @@ impl_removeRowSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_remove_row_selection (table, row); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_removeColumnSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -592,21 +592,21 @@ impl_removeColumnSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ret = atk_table_remove_column_selection (table, column); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -625,7 +625,7 @@ impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } column = atk_table_get_column_at_index (table, index); row = atk_table_get_row_at_index (table, index); @@ -640,10 +640,10 @@ impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, row, DBUS_TYPE_INT32, - column, DBUS_TYPE_INT32, row_extents, - DBUS_TYPE_INT32, col_extents, - DBUS_TYPE_BOOLEAN, is_selected, - DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); + column, DBUS_TYPE_INT32, row_extents, + DBUS_TYPE_INT32, col_extents, + DBUS_TYPE_BOOLEAN, is_selected, + DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); } return reply; } diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c index 7c88211..ebbea28 100644 --- a/atk-adaptor/text-adaptor.c +++ b/atk-adaptor/text-adaptor.c @@ -31,7 +31,7 @@ static dbus_bool_t impl_get_characterCount (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; g_return_val_if_fail (ATK_IS_TEXT (user_data), FALSE); @@ -40,7 +40,7 @@ impl_get_characterCount (DBusMessageIter * iter, static dbus_bool_t impl_get_caretOffset (DBusMessageIter * iter, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; g_return_val_if_fail (ATK_IS_TEXT (user_data), FALSE); @@ -63,7 +63,7 @@ impl_getText (DBusConnection * bus, DBusMessage * message, void *user_data) (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } txt = atk_text_get_text (text, startOffset, endOffset); if (!txt) @@ -72,7 +72,7 @@ impl_getText (DBusConnection * bus, DBusMessage * message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } g_free (txt); return reply; @@ -80,7 +80,7 @@ impl_getText (DBusConnection * bus, DBusMessage * message, void *user_data) static DBusMessage * impl_setCaretOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -94,21 +94,21 @@ impl_setCaretOffset (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_text_set_caret_offset (text, offset); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -126,11 +126,11 @@ impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } txt = atk_text_get_text_before_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; if (!txt) @@ -139,8 +139,8 @@ impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, - &txt, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, + &txt, DBUS_TYPE_INVALID); } g_free (txt); return reply; @@ -148,7 +148,7 @@ impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset, type; @@ -165,11 +165,11 @@ impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } txt = atk_text_get_text_at_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; if (!txt) @@ -178,8 +178,8 @@ impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, - &txt, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, + &txt, DBUS_TYPE_INVALID); } g_free (txt); return reply; @@ -187,7 +187,7 @@ impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -205,11 +205,11 @@ impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } txt = atk_text_get_text_after_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; if (!txt) @@ -218,8 +218,8 @@ impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, - &txt, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING, + &txt, DBUS_TYPE_INVALID); } g_free (txt); return reply; @@ -227,7 +227,7 @@ impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getCharacterAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -241,7 +241,7 @@ impl_getCharacterAtOffset (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } ch = atk_text_get_character_at_offset (text, offset); reply = dbus_message_new_method_return (message); @@ -254,7 +254,7 @@ impl_getCharacterAtOffset (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -276,11 +276,11 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, &attributeName, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } set = atk_text_get_run_attributes (text, offset, - &intstart_offset, &intend_offset); + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; defined = FALSE; @@ -289,11 +289,11 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, { at = (AtkAttribute *) cur_attr->data; if (!strcmp (at->name, attributeName)) - { - rv = at->value; - defined = TRUE; - break; - } + { + rv = at->value; + defined = TRUE; + break; + } cur_attr = cur_attr->next; } if (!rv) @@ -302,9 +302,9 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, - DBUS_TYPE_BOOLEAN, &defined, DBUS_TYPE_STRING, - &rv, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, + DBUS_TYPE_BOOLEAN, &defined, DBUS_TYPE_STRING, + &rv, DBUS_TYPE_INVALID); } atk_attribute_set_free (set); return reply; @@ -323,9 +323,9 @@ _string_from_attribute_set (AtkAttributeSet * set) { at = (AtkAttribute *) cur_attr->data; tmp = g_strdup_printf ("%s%s:%s%s", - ((GSList *) (set) == cur_attr) ? "" : " ", - at->name, at->value, - (cur_attr->next) ? ";" : ""); + ((GSList *) (set) == cur_attr) ? "" : " ", + at->name, at->value, + (cur_attr->next) ? ";" : ""); tmp2 = g_strconcat (attributes, tmp, NULL); g_free (tmp); g_free (attributes); @@ -337,7 +337,7 @@ _string_from_attribute_set (AtkAttributeSet * set) static DBusMessage * impl_getAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -354,11 +354,11 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } set = atk_text_get_run_attributes (text, offset, - &intstart_offset, &intend_offset); + &intstart_offset, &intend_offset); rv = _string_from_attribute_set (set); @@ -368,7 +368,7 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); } atk_attribute_set_free (set); g_free(rv); @@ -377,7 +377,7 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; char *rv; @@ -395,7 +395,7 @@ impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } g_free (rv); atk_attribute_set_free (set); @@ -404,7 +404,7 @@ impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -421,10 +421,10 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } atk_text_get_character_extents (text, offset, &ix, &iy, &iw, &ih, - (AtkCoordType) coordType); + (AtkCoordType) coordType); x = ix; y = iy; width = iw; @@ -433,15 +433,15 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, - &y, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, - &height, DBUS_TYPE_INVALID); + &y, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, + &height, DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y; @@ -457,21 +457,21 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_text_get_offset_at_point (text, x, y, coordType); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getNSelections (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t rv; @@ -484,14 +484,14 @@ impl_getNSelections (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; @@ -506,26 +506,26 @@ impl_getSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } /* atk_text_get_selection returns gchar * which we discard */ g_free (atk_text_get_selection - (text, selectionNum, &intstart_offset, &intend_offset)); + (text, selectionNum, &intstart_offset, &intend_offset)); startOffset = intstart_offset; endOffset = intend_offset; reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, - DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_addSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -540,21 +540,21 @@ impl_addSelection (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_text_add_selection (text, startOffset, endOffset); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_removeSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; @@ -568,21 +568,21 @@ impl_removeSelection (DBusConnection * bus, DBusMessage * message, if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_text_remove_selection (text, selectionNum); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_setSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum, startOffset, endOffset; @@ -597,21 +597,21 @@ impl_setSelection (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = atk_text_set_selection (text, selectionNum, startOffset, endOffset); reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static DBusMessage * impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -628,11 +628,11 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } memset (&rect, 0, sizeof (rect)); atk_text_get_range_extents (text, startOffset, endOffset, - (AtkCoordType) coordType, &rect); + (AtkCoordType) coordType, &rect); x = rect.x; y = rect.y; width = rect.width; @@ -641,8 +641,8 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, - &y, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, - &height, DBUS_TYPE_INVALID); + &y, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, + &height, DBUS_TYPE_INVALID); } return reply; } @@ -651,7 +651,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y, width, height; @@ -671,7 +671,7 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, &coordType, DBUS_TYPE_INT32, &xClipType, DBUS_TYPE_INT32, &yClipType, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rect.x = x; rect.y = y; @@ -680,8 +680,8 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, range_list = atk_text_get_bounded_ranges (text, &rect, (AtkCoordType) coordType, - (AtkTextClipType) xClipType, - (AtkTextClipType) yClipType); + (AtkTextClipType) xClipType, + (AtkTextClipType) yClipType); reply = dbus_message_new_method_return (message); if (!reply) return NULL; @@ -692,31 +692,31 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, { int len; for (len = 0; len < MAXRANGELEN && range_list[len]; ++len) - { - if (dbus_message_iter_open_container - (&array, DBUS_TYPE_STRUCT, NULL, &struc)) - { - dbus_int32_t val; - val = range_list[len]->start_offset; - dbus_message_iter_append_basic (&struc, DBUS_TYPE_INT32, &val); - val = range_list[len]->end_offset; - dbus_message_iter_append_basic (&struc, DBUS_TYPE_INT32, &val); - dbus_message_iter_append_basic (&struc, DBUS_TYPE_STRING, - &range_list[len]->content); - /* The variant is unimplemented in atk, but I don't want to - * unilaterally muck with the spec and remove it, so I'll just - * throw in a dummy value */ - if (dbus_message_iter_open_container - (&array, DBUS_TYPE_VARIANT, "i", &variant)) - { - dbus_uint32_t dummy = 0; - dbus_message_iter_append_basic (&variant, DBUS_TYPE_INT32, - &dummy); - dbus_message_iter_close_container (&struc, &variant); - } - dbus_message_iter_close_container (&array, &struc); - } - } + { + if (dbus_message_iter_open_container + (&array, DBUS_TYPE_STRUCT, NULL, &struc)) + { + dbus_int32_t val; + val = range_list[len]->start_offset; + dbus_message_iter_append_basic (&struc, DBUS_TYPE_INT32, &val); + val = range_list[len]->end_offset; + dbus_message_iter_append_basic (&struc, DBUS_TYPE_INT32, &val); + dbus_message_iter_append_basic (&struc, DBUS_TYPE_STRING, + &range_list[len]->content); + /* The variant is unimplemented in atk, but I don't want to + * unilaterally muck with the spec and remove it, so I'll just + * throw in a dummy value */ + if (dbus_message_iter_open_container + (&array, DBUS_TYPE_VARIANT, "i", &variant)) + { + dbus_uint32_t dummy = 0; + dbus_message_iter_append_basic (&variant, DBUS_TYPE_INT32, + &dummy); + dbus_message_iter_close_container (&struc, &variant); + } + dbus_message_iter_close_container (&array, &struc); + } + } dbus_message_iter_close_container (&iter, &array); } return reply; @@ -724,7 +724,7 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getAttributeRun (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { DBusError error; AtkText *text = (AtkText *) user_data; @@ -746,12 +746,12 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message, (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, &includeDefaults, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } attributes = atk_text_get_run_attributes (text, offset, &intstart_offset, - &intend_offset); + &intend_offset); if (attributes) total_attributes = n_attributes = g_slist_length (attributes); @@ -760,7 +760,7 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message, { default_attributes = atk_text_get_default_attributes (text); if (default_attributes) - n_default_attributes = g_slist_length (default_attributes); + n_default_attributes = g_slist_length (default_attributes); total_attributes += n_default_attributes; } @@ -772,28 +772,28 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message, if (total_attributes) { for (i = 0; i < n_attributes; ++i) - { - attr = g_slist_nth_data (attributes, i); - retval[i] = g_strconcat (attr->name, ":", attr->value, NULL); - } + { + attr = g_slist_nth_data (attributes, i); + retval[i] = g_strconcat (attr->name, ":", attr->value, NULL); + } for (j = 0; j < n_default_attributes; ++i, ++j) - { - attr = g_slist_nth_data (default_attributes, j); - retval[i] = g_strconcat (attr->name, ":", attr->value, NULL); - } + { + attr = g_slist_nth_data (default_attributes, j); + retval[i] = g_strconcat (attr->name, ":", attr->value, NULL); + } atk_attribute_set_free (attributes); if (default_attributes) - atk_attribute_set_free (default_attributes); + atk_attribute_set_free (default_attributes); } reply = dbus_message_new_method_return (message); if (reply) { dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING, &retval, total_attributes, - DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_ARRAY, + DBUS_TYPE_STRING, &retval, total_attributes, + DBUS_TYPE_INVALID); } for (i = 0; i < total_attributes; i++) g_free (retval[i]); @@ -803,7 +803,7 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_getDefaultAttributeSet (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; DBusMessage *reply; @@ -833,7 +833,7 @@ impl_getDefaultAttributeSet (DBusConnection * bus, DBusMessage * message, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, - &retval, n_attributes, DBUS_TYPE_INVALID); + &retval, n_attributes, DBUS_TYPE_INVALID); } for (i = 0; i < n_attributes; i++) g_free (retval[i]); diff --git a/atk-adaptor/tree-adaptor.c b/atk-adaptor/tree-adaptor.c index c031d43..78ba624 100644 --- a/atk-adaptor/tree-adaptor.c +++ b/atk-adaptor/tree-adaptor.c @@ -83,12 +83,21 @@ impl_getRoot (DBusConnection *bus, DBusMessage *message, void *user_data) AtkObject *root = atk_get_root(); char *path; DBusMessage *reply; + gchar *errmsg; if (!root) - return spi_dbus_general_error (message); + { + reply = dbus_message_new_error (message, + DBUS_ERROR_FAILED, + "No root accessible available"); + } path = atk_dbus_object_to_path (root); if (!path) - return spi_dbus_general_error (message); + { + reply = dbus_message_new_error (message, + DBUS_ERROR_FAILED, + "No root accessible available"); + } reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); g_free (path); diff --git a/login-helper/login-helper.c b/login-helper/login-helper.c index 20fa9b0..68e5017 100644 --- a/login-helper/login-helper.c +++ b/login-helper/login-helper.c @@ -43,7 +43,7 @@ static gboolean login_helper_set_safe (LoginHelper *helper, gboolean safe) { LoginHelperClass *klass = LOGIN_HELPER_GET_CLASS (helper); - + if (klass->set_safe) return (* klass->set_safe)(helper, safe); else @@ -64,7 +64,7 @@ impl_set_safe (DBusConnection *bus, DBusMessage *message, void *user_data) if (!dbus_message_get_args (message, &error, DBUS_TYPE_BOOLEAN, &safe, DBUS_TYPE_INVALID)) { - return SPI_DBUS_RETURN_ERROR (message, &error); + return droute_invalid_arguments_error (message); } rv = login_helper_set_safe (helper, safe); reply = dbus_message_new_method_return (message); @@ -79,7 +79,7 @@ static LoginHelperDeviceReqFlags login_helper_get_device_reqs (LoginHelper *helper) { LoginHelperClass *klass = LOGIN_HELPER_GET_CLASS (helper); - + if (klass->get_device_reqs) return (* klass->get_device_reqs)(helper); else @@ -149,7 +149,6 @@ login_helper_class_init (LoginHelperClass *klass) g_object_parent_class = g_type_class_peek_parent (klass); object_class->finalize = login_helper_finalize; - } static void @@ -157,7 +156,4 @@ login_helper_init (LoginHelper *object) { } -G_DEFINE_TYPE (LoginHelper, - login_helper, - PARENT_TYPE) - +G_DEFINE_TYPE (LoginHelper, login_helper, PARENT_TYPE) diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index bdc5816..2d41ef4 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -164,6 +164,35 @@ static gboolean spi_dec_poll_mouse_idle (gpointer data); G_DEFINE_TYPE(SpiDEController, spi_device_event_controller, G_TYPE_OBJECT) /* Private methods */ +static dbus_bool_t +spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name) +{ + char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name); + if (match) + { + DBusError error; + dbus_error_init (&error); + dbus_bus_add_match (bus, match, &error); + g_free (match); + return !dbus_error_is_set (&error); + } + else return FALSE; +} + +static dbus_bool_t +spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name) +{ + char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name); + if (match) + { + DBusError error; + dbus_error_init (&error); + dbus_bus_remove_match (bus, match, &error); + g_free (match); + return !dbus_error_is_set (&error); + } + else return FALSE; +} static unsigned int keysym_mod_mask (KeySym keysym, KeyCode keycode) @@ -1852,7 +1881,7 @@ impl_register_device_listener (DBusConnection *bus, dbus_error_init(&error); if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } dec_listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types); ret = spi_controller_register_device_listener ( @@ -2040,7 +2069,7 @@ impl_deregister_device_listener (DBusConnection *bus, dbus_error_init(&error); if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types); spi_controller_deregister_device_listener ( @@ -2351,7 +2380,7 @@ static DBusMessage * impl_generate_keyboard_event (DBusConnection *bus, DBusMess dbus_error_init(&error); if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } #ifdef SPI_DEBUG @@ -2429,7 +2458,7 @@ static DBusMessage * impl_generate_mouse_event (DBusConnection *bus, DBusMessage if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } #ifdef SPI_DEBUG @@ -2501,7 +2530,7 @@ impl_notify_listeners_sync (DBusConnection *bus, DBusMessage *message, void *use if (!spi_dbus_demarshal_deviceEvent(message, &event)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } #ifdef SPI_DEBUG g_print ("notifylistening listeners synchronously: controller %p, event id %d\n", @@ -2528,7 +2557,7 @@ impl_notify_listeners_async (DBusConnection *bus, DBusMessage *message, void *us if (!spi_dbus_demarshal_deviceEvent(message, &event)) { - return spi_dbus_general_error (message); + return droute_invalid_arguments_error (message); } #ifdef SPI_DEBUG g_print ("notifylistening listeners asynchronously: controller %p, event id %d\n", diff --git a/spi-common/spi-dbus.c b/spi-common/spi-dbus.c index 19e5528..75c5d4c 100644 --- a/spi-common/spi-dbus.c +++ b/spi-common/spi-dbus.c @@ -29,6 +29,7 @@ #include "spi-types.h" +/* DBusMessage * spi_dbus_general_error (DBusMessage * message) { @@ -36,6 +37,7 @@ spi_dbus_general_error (DBusMessage * message) "org.freedesktop.atspi.GeneralError", "General error"); } +*/ DBusMessage * @@ -148,6 +150,7 @@ dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_D return spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); } +/* dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error) { DBusMessage *message, *reply; @@ -176,33 +179,4 @@ dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, dbus_message_unref (reply); return TRUE; } - -dbus_bool_t -spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name) -{ - char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name); - if (match) - { - DBusError error; - dbus_error_init (&error); - dbus_bus_add_match (bus, match, &error); - g_free (match); - return !dbus_error_is_set (&error); - } - else return FALSE; -} - -dbus_bool_t -spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name) -{ - char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name); - if (match) - { - DBusError error; - dbus_error_init (&error); - dbus_bus_remove_match (bus, match, &error); - g_free (match); - return !dbus_error_is_set (&error); - } - else return FALSE; -} +*/ diff --git a/spi-common/spi-dbus.h b/spi-common/spi-dbus.h index a2bc5b7..15eb177 100644 --- a/spi-common/spi-dbus.h +++ b/spi-common/spi-dbus.h @@ -61,15 +61,15 @@ extern int _dbg; DBusMessage *spi_dbus_general_error(DBusMessage *message); DBusMessage *spi_dbus_return_rect(DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight); -#define SPI_DBUS_RETURN_ERROR(m, e) dbus_message_new_error(m, (e)->name, (e)->message) - void spi_dbus_emit_valist(DBusConnection *bus, const char *path, const char *interface, const char *name, int first_arg_type, va_list args); dbus_bool_t spi_dbus_message_iter_get_struct(DBusMessageIter *iter, ...); dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...); dbus_bool_t spi_dbus_marshall_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e); dbus_bool_t spi_dbus_demarshall_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e); dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error); +/* void spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name); void spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name); +*/ #endif /* SPI_DBUS_H_ */