meson: Actually use the soversion

[platform/upstream/at-spi2-core.git] / atspi / atspi-table-cell.c

diff --git a/atspi/atspi-table-cell.c b/atspi/atspi-table-cell.c
index 44ff4d0..1df1fa9 100644 (file)
--- a/atspi/atspi-table-cell.c
+++ b/atspi/atspi-table-cell.c
@@ -63,7 +63,7 @@ get_object_array_and_unref (DBusMessage *reply)
  * or 0 if the cell does not implement this method.
  */
 gint
-atspi_table_cell_get_column_span (AtspiTableCell *obj, GError *error)
+atspi_table_cell_get_column_span (AtspiTableCell *obj, GError **error)
 {
   dbus_int32_t retval = -1;
 
@@ -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
  *
@@ -147,7 +126,7 @@ atspi_table_cell_get_row_span (AtspiTableCell *obj, GError **error)
  *
  * Returns: (element-type AtspiAccessible) (transfer full): a GPtrArray of
  * AtspiAccessibles representing the row header cells.
- *  */
+ */
 GPtrArray *
 atspi_table_cell_get_row_header_cells (AtspiTableCell *obj, GError **error)
 {
@@ -174,18 +153,22 @@ gint
 atspi_table_cell_get_position (AtspiTableCell *obj,
                                gint *row,
                                gint *column,
-                               GError *error)
+                               GError **error)
 {
   DBusMessage *reply;
   DBusMessageIter iter, iter_struct, iter_variant;
   dbus_int32_t d_row = -1, d_column = -1;
+  char *iter_sig;
 
   g_return_val_if_fail (obj != NULL, -1);
 
-  reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBuss.Properties",
-                                    "Get", atspi_interface_table_cell,
-                                    "Position");
+  reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBus.Properties",
+                                    "Get", error, "ss",
+                                    atspi_interface_table_cell, "Position");
          
+  if (!reply)
+    return -1;
+
   dbus_message_iter_init (reply, &iter);
 
   /* TODO: Return error here */
@@ -193,9 +176,14 @@ atspi_table_cell_get_position (AtspiTableCell *obj,
     return FALSE;
 
   dbus_message_iter_recurse (&iter, &iter_variant);
+  iter_sig = dbus_message_iter_get_signature (&iter_variant);
   /* TODO: Also report error here */
-  if (strcmp (dbus_message_iter_get_signature (&iter_variant), "(ii)") != 0)
+  if (strcmp (iter_sig, "(ii)") != 0)
+  {
+    dbus_free (iter_sig);
     return FALSE;
+  }
+  dbus_free (iter_sig);
 
   dbus_message_iter_recurse (&iter_variant, &iter_struct);
   dbus_message_iter_get_basic (&iter_struct, &d_row);