Table cell API fixes

We had a non-working get_column_index function and no get_row_index
function. GetPosition is the only function implemented on at-spi2-atk.
Removed the non-working functions, for consistency, and add a missing
prototype for atspi_table_cell_get_position.

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

diff --git a/atspi/atspi-table-cell.c b/atspi/atspi-table-cell.c
index 3c00519..c18e6dc 100644 (file)
--- a/atspi/atspi-table-cell.c
+++ b/atspi/atspi-table-cell.c
@@ -97,27 +97,6 @@ atspi_table_cell_get_column_header_cells (AtspiTableCell *obj, GError **error)
 }
 
 /**
 }
 
 /**

- * atspi_table_cell_get_column_index:
- * @obj: a GObject instance that implements AtspiTableCellIface
- *
- * Translates this cell accessible into the corresponding column index.
- *
- * Returns: the column index for this cell, or -1 if unimplemented.
- */
-gint
-atspi_table_cell_get_column_index (AtspiTableCell *obj, GError **error)
-{
-  dbus_int32_t retval = -1;
-
-  g_return_val_if_fail (obj != NULL, -1);
-
-  _atspi_dbus_get_property (obj, atspi_interface_table_cell, "ColumnIndex",
-                            error, "i", &retval);
-         
-  return retval;
-}
-
-/**

  * atspi_table_cell_get_row_span:
  * @obj: a GObject instance that implements AtspiTableCellIface
  *
  * atspi_table_cell_get_row_span:
  * @obj: a GObject instance that implements AtspiTableCellIface
  *


@@ -174,7 +153,7 @@ gint
 atspi_table_cell_get_position (AtspiTableCell *obj,
                                gint *row,
                                gint *column,
 atspi_table_cell_get_position (AtspiTableCell *obj,
                                gint *row,
                                gint *column,

-                               GError *error)
+                               GError **error)

 {
   DBusMessage *reply;
   DBusMessageIter iter, iter_struct, iter_variant;
 {
   DBusMessage *reply;
   DBusMessageIter iter, iter_struct, iter_variant;

diff --git a/atspi/atspi-table-cell.h b/atspi/atspi-table-cell.h
index 8174db8..757ab0d 100644 (file)
--- a/atspi/atspi-table-cell.h
+++ b/atspi/atspi-table-cell.h
@@ -58,7 +58,10 @@ gint atspi_table_cell_get_row_span (AtspiTableCell *obj, GError **error);
 GPtrArray *atspi_table_cell_get_row_header_cells (AtspiTableCell *obj,
                                                   GError **error);
 
 GPtrArray *atspi_table_cell_get_row_header_cells (AtspiTableCell *obj,
                                                   GError **error);
 

-gint atspi_table_cell_get_row_index (AtspiTableCell *obj, GError **error);
+gint atspi_table_cell_get_position (AtspiTableCell *obj,
+                                    gint           *row,
+                                    gint           *column,
+                                    GError        **error);

 
 void atspi_table_cell_get_row_column_span (AtspiTableCell *obj,
                                               gint *row,
 
 void atspi_table_cell_get_row_column_span (AtspiTableCell *obj,
                                               gint *row,