Code style enforcement.

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / table-adaptor.c

diff --git a/atk-adaptor/table-adaptor.c b/atk-adaptor/table-adaptor.c
index cc8cfbe..212004a 100644 (file)
--- a/atk-adaptor/table-adaptor.c
+++ b/atk-adaptor/table-adaptor.c
@@ -26,10 +26,10 @@
 #include <droute/droute.h>
 
 #include "accessible-marshaller.h"
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
 
 static dbus_bool_t
-impl_get_nRows (DBusMessageIter * iter, void *user_data)
+impl_get_NRows (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -37,7 +37,7 @@ impl_get_nRows (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_nColumns (DBusMessageIter * iter, void *user_data)
+impl_get_NColumns (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
@@ -45,26 +45,25 @@ impl_get_nColumns (DBusMessageIter * iter, void *user_data)
 }
 
 static dbus_bool_t
-impl_get_caption (DBusMessageIter * iter, void *user_data)
+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
-impl_get_summary (DBusMessageIter * iter, void *user_data)
+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)
+impl_get_NSelectedRows (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   gint *selected_rows = NULL;
@@ -77,8 +76,7 @@ impl_get_nSelectedRows (DBusMessageIter * iter,
 }
 
 static dbus_bool_t
-impl_get_nSelectedColumns (DBusMessageIter * iter,
-                          void *user_data)
+impl_get_NSelectedColumns (DBusMessageIter * iter, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   gint *selected_columns = NULL;
@@ -91,8 +89,8 @@ impl_get_nSelectedColumns (DBusMessageIter * iter,
 }
 
 static DBusMessage *
-impl_getAccessibleAt (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
+impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message,
+                      void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -106,14 +104,14 @@ 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);
+  return spi_dbus_return_object (message, obj, TRUE, TRUE);
 }
 
 static DBusMessage *
-impl_getIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -128,21 +126,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)
+impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message,
+                    void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t index;
@@ -156,21 +154,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)
+impl_GetColumnAtIndex (DBusConnection * bus, DBusMessage * message,
+                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t index;
@@ -184,21 +182,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)
+impl_GetRowDescription (DBusConnection * bus, DBusMessage * message,
+                        void *user_data)
 {
   dbus_int32_t row;
   AtkTable *table = (AtkTable *) user_data;
@@ -212,7 +210,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 +219,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)
+impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message,
+                           void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t column;
@@ -242,7 +240,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 +249,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)
+impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message,
+                     void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -273,21 +271,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)
+impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message,
+                        void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -302,21 +300,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)
+impl_GetRowHeader (DBusConnection * bus, DBusMessage * message,
+                   void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row;
@@ -329,15 +327,16 @@ 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);
+  obj = atk_table_get_row_header (table, row);
+  return spi_dbus_return_object (message, obj, TRUE, FALSE);
 }
 
 static DBusMessage *
-impl_getColumnHeader (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
+impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message,
+                      void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t column;
@@ -350,15 +349,16 @@ 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);
+  obj = atk_table_get_column_header (table, column);
+  return spi_dbus_return_object (message, obj, TRUE, FALSE);
 }
 
 static DBusMessage *
-impl_getSelectedRows (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
+impl_GetSelectedRows (DBusConnection * bus, DBusMessage * message,
+                      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);
@@ -383,8 +383,8 @@ impl_getSelectedRows (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message,
-                        void *user_data)
+impl_GetSelectedColumns (DBusConnection * bus, DBusMessage * message,
+                         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);
@@ -409,8 +409,8 @@ impl_getSelectedColumns (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isRowSelected (DBusConnection * bus, DBusMessage * message,
-                   void *user_data)
+impl_IsRowSelected (DBusConnection * bus, DBusMessage * message,
+                    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)
+impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message,
+                       void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t column;
@@ -452,20 +452,20 @@ 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;
 }
 
 static DBusMessage *
-impl_isSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkTable *table = (AtkTable *) user_data;
   dbus_int32_t row, column;
@@ -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)
+impl_AddRowSelection (DBusConnection * bus, DBusMessage * message,
+                      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)
+impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message,
+                         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)
+impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message,
+                         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)
+impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message,
+                            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)
+impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
+                                 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);
@@ -639,54 +639,53 @@ impl_getRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message,
   reply = dbus_message_new_method_return (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);
+      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret,
+                                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_INVALID);
     }
   return reply;
 }
 
 static DRouteMethod methods[] = {
-  {impl_getAccessibleAt, "getAccessibleAt"},
-  {impl_getIndexAt, "getIndexAt"},
-  {impl_getRowAtIndex, "getRowAtIndex"},
-  {impl_getColumnAtIndex, "getColumnAtIndex"},
-  {impl_getRowDescription, "getRowDescription"},
-  {impl_getColumnDescription, "getColumnDescription"},
-  {impl_getRowExtentAt, "getRowExtentAt"},
-  {impl_getColumnExtentAt, "getColumnExtentAt"},
-  {impl_getRowHeader, "getRowHeader"},
-  {impl_getColumnHeader, "getColumnHeader"},
-  {impl_getSelectedRows, "getSelectedRows"},
-  {impl_getSelectedColumns, "getSelectedColumns"},
-  {impl_isRowSelected, "isRowSelected"},
-  {impl_isColumnSelected, "isColumnSelected"},
-  {impl_isSelected, "isSelected"},
-  {impl_addRowSelection, "addRowSelection"},
-  {impl_addColumnSelection, "addColumnSelection"},
-  {impl_removeRowSelection, "removeRowSelection"},
-  {impl_removeColumnSelection, "removeColumnSelection"},
-  {impl_getRowColumnExtentsAtIndex, "getRowColumnExtentsAtIndex"},
+  {impl_GetAccessibleAt, "GetAccessibleAt"},
+  {impl_GetIndexAt, "GetIndexAt"},
+  {impl_GetRowAtIndex, "GetRowAtIndex"},
+  {impl_GetColumnAtIndex, "GetColumnAtIndex"},
+  {impl_GetRowDescription, "GetRowDescription"},
+  {impl_GetColumnDescription, "GetColumnDescription"},
+  {impl_GetRowExtentAt, "GetRowExtentAt"},
+  {impl_GetColumnExtentAt, "GetColumnExtentAt"},
+  {impl_GetRowHeader, "GetRowHeader"},
+  {impl_GetColumnHeader, "GetColumnHeader"},
+  {impl_GetSelectedRows, "GetSelectedRows"},
+  {impl_GetSelectedColumns, "GetSelectedColumns"},
+  {impl_IsRowSelected, "IsRowSelected"},
+  {impl_IsColumnSelected, "IsColumnSelected"},
+  {impl_IsSelected, "IsSelected"},
+  {impl_AddRowSelection, "AddRowSelection"},
+  {impl_AddColumnSelection, "AddColumnSelection"},
+  {impl_RemoveRowSelection, "RemoveRowSelection"},
+  {impl_RemoveColumnSelection, "RemoveColumnSelection"},
+  {impl_GetRowColumnExtentsAtIndex, "GetRowColumnExtentsAtIndex"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_nRows, NULL, "nRows"},
-  {impl_get_nColumns, NULL, "nColumns"},
-  {impl_get_caption, NULL, "caption"},
-  {impl_get_summary, NULL, "summary"},
-  {impl_get_nSelectedRows, NULL, "nSelectedRows"},
-  {impl_get_nSelectedColumns, NULL, "nSelectedColumns"},
+  {impl_get_NRows, NULL, "NRows"},
+  {impl_get_NColumns, NULL, "NColumns"},
+  {impl_get_Caption, NULL, "Caption"},
+  {impl_get_Summary, NULL, "Summary"},
+  {impl_get_NSelectedRows, NULL, "nSelectedRows"},
+  {impl_get_NSelectedColumns, NULL, "nSelectedColumns"},
   {NULL, NULL, NULL}
 };
 
 void
-spi_initialize_table (DRoutePath *path)
+spi_initialize_table (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_TABLE,
-                             methods,
-                             properties);
+                             SPI_DBUS_INTERFACE_TABLE, methods, properties);
 };