aboutsummaryrefslogtreecommitdiffstats
path: root/a11y/e-table
diff options
context:
space:
mode:
Diffstat (limited to 'a11y/e-table')
-rw-r--r--a11y/e-table/gal-a11y-e-cell-popup.c6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-popup.h6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-registry.c6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-registry.h12
-rw-r--r--a11y/e-table/gal-a11y-e-cell-text.c18
-rw-r--r--a11y/e-table/gal-a11y-e-cell-text.h6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-toggle.c6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-toggle.h6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-tree.c6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-tree.h8
-rw-r--r--a11y/e-table/gal-a11y-e-cell-vbox.c8
-rw-r--r--a11y/e-table/gal-a11y-e-cell-vbox.h8
-rw-r--r--a11y/e-table/gal-a11y-e-cell.c22
-rw-r--r--a11y/e-table/gal-a11y-e-cell.h18
-rw-r--r--a11y/e-table/gal-a11y-e-table-click-to-add.c6
-rw-r--r--a11y/e-table/gal-a11y-e-table-column-header.c4
-rw-r--r--a11y/e-table/gal-a11y-e-table-item.c40
-rw-r--r--a11y/e-table/gal-a11y-e-table.c4
-rw-r--r--a11y/e-table/gal-a11y-e-tree.c2
19 files changed, 96 insertions, 96 deletions
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 5ae3cef686..f76b2431b0 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -83,9 +83,9 @@ AtkObject *
gal_a11y_e_cell_popup_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *a11y;
GalA11yECell *cell;
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index 4bee17e8ce..7fef5cf18d 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -55,8 +55,8 @@ GType gal_a11y_e_cell_popup_get_type (void);
AtkObject *gal_a11y_e_cell_popup_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
#endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
index 1da241fea9..9dc9598608 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ b/a11y/e-table/gal-a11y-e-cell-registry.c
@@ -111,9 +111,9 @@ gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *registry,
ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
GalA11yECellRegistryFunc func = NULL;
GType type;
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
index bc43a662cc..0620fd1b9c 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ b/a11y/e-table/gal-a11y-e-cell-registry.h
@@ -41,9 +41,9 @@ typedef struct _GalA11yECellRegistryPrivate GalA11yECellRegistryPrivate;
typedef AtkObject *(*GalA11yECellRegistryFunc) (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
struct _GalA11yECellRegistry {
GObject object;
@@ -62,9 +62,9 @@ AtkObject *gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *re
ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
void gal_a11y_e_cell_registry_add_cell_type (GalA11yECellRegistry *registry,
GType type,
GalA11yECellRegistryFunc func);
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index a2b9f715f8..77823b0a7c 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -86,11 +86,11 @@ ect_check (gpointer a11y)
return TRUE;
}
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
ect_get_name (AtkObject * a11y)
{
GalA11yECell *gaec;
- char *name;
+ gchar *name;
if (!ect_check (a11y))
return NULL;
@@ -180,7 +180,7 @@ ect_get_character_at_offset (AtkText *text,
}
-static gchar*
+static gchar *
ect_get_text_before_offset (AtkText *text,
gint offset,
AtkTextBoundary boundary_type,
@@ -294,7 +294,7 @@ ect_get_n_selections (AtkText *text)
}
-static gchar*
+static gchar *
ect_get_selection (AtkText *text,
gint selection_num,
gint *start_offset,
@@ -543,7 +543,7 @@ ect_do_action_edit (AtkAction *action)
/* text signal handlers */
static void
-ect_text_inserted_cb (ECellText *text, ECellView *cell_view, int pos, int len, int row, int model_col, gpointer data)
+ect_text_inserted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data)
{
GalA11yECellText *gaet;
GalA11yECell *gaec;
@@ -560,7 +560,7 @@ ect_text_inserted_cb (ECellText *text, ECellView *cell_view, int pos, int len, i
}
static void
-ect_text_deleted_cb (ECellText *text, ECellView *cell_view, int pos, int len, int row, int model_col, gpointer data)
+ect_text_deleted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data)
{
GalA11yECellText *gaet;
GalA11yECell *gaec;
@@ -692,9 +692,9 @@ AtkObject *
gal_a11y_e_cell_text_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *a11y;
GalA11yECell *gaec;
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index fe404169a1..2e469d76f6 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -57,8 +57,8 @@ GType gal_a11y_e_cell_text_get_type (void);
AtkObject *gal_a11y_e_cell_text_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
#endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index c0425a0cbb..1101bac7ee 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -143,9 +143,9 @@ AtkObject*
gal_a11y_e_cell_toggle_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *a11y;
GalA11yECell *cell;
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
index 769e0b4200..1f41ae1623 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.h
@@ -56,9 +56,9 @@ struct _GalA11yECellToggleClass
AtkObject *gal_a11y_e_cell_toggle_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
#ifdef __cplusplus
}
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index 0a5f8e2019..aaf490c726 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -184,9 +184,9 @@ AtkObject *
gal_a11y_e_cell_tree_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *subcell_a11y;
GalA11yECellTree *a11y;
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
index 43169c2f28..497590b351 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ b/a11y/e-table/gal-a11y-e-cell-tree.h
@@ -44,7 +44,7 @@ typedef struct _GalA11yECellTreePrivate GalA11yECellTreePrivate;
struct _GalA11yECellTree {
GalA11yECell object;
- int model_row_changed_id;
+ gint model_row_changed_id;
};
struct _GalA11yECellTreeClass {
@@ -57,8 +57,8 @@ GType gal_a11y_e_cell_tree_get_type (void);
AtkObject *gal_a11y_e_cell_tree_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
#endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c
index 7a5eadba52..b3f92a695a 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.c
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.c
@@ -120,7 +120,7 @@ ecv_ref_accessible_at_point (AtkComponent *component,
AtkCoordType coord_type)
{
gint x0, y0, width, height;
- int subcell_height, i;
+ gint subcell_height, i;
GalA11yECell *gaec = GAL_A11Y_E_CELL (component);
ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
@@ -203,9 +203,9 @@ gal_a11y_e_cell_vbox_get_type (void)
AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *a11y;
GalA11yECell *gaec;
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h
index 2055ac3195..cf6375a2be 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.h
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.h
@@ -44,7 +44,7 @@ typedef struct _GalA11yECellVboxClass GalA11yECellVboxClass;
struct _GalA11yECellVbox
{
GalA11yECell object;
- int a11y_subcell_count;
+ gint a11y_subcell_count;
gpointer *a11y_subcells;
};
@@ -57,9 +57,9 @@ GType gal_a11y_e_cell_vbox_get_type (void);
AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
#ifdef __cplusplus
}
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index 3b74675ae5..a316500af7 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -103,7 +103,7 @@ gal_a11y_e_cell_dispose (GObject *object)
}
/* Static functions */
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
gal_a11y_e_cell_get_name (AtkObject * a11y)
{
GalA11yECell *cell = GAL_A11Y_E_CELL (a11y);
@@ -163,10 +163,10 @@ gal_a11y_e_cell_get_extents (AtkComponent *component,
{
GalA11yECell *a11y = GAL_A11Y_E_CELL (component);
GtkWidget *tableOrTree;
- int row;
- int col;
- int xval;
- int yval;
+ gint row;
+ gint col;
+ gint xval;
+ gint yval;
row = a11y->row;
col = a11y->view_col;
@@ -593,9 +593,9 @@ AtkObject *
gal_a11y_e_cell_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
AtkObject *a11y;
@@ -616,9 +616,9 @@ gal_a11y_e_cell_construct (AtkObject *object,
ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row)
+ gint model_col,
+ gint view_col,
+ gint row)
{
GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
a11y->item = item;
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
index af96c69d47..3ec3070a9b 100644
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ b/a11y/e-table/gal-a11y-e-cell.h
@@ -49,9 +49,9 @@ struct _GalA11yECell {
ETableItem *item;
ECellView *cell_view;
AtkObject *parent;
- int model_col;
- int view_col;
- int row;
+ gint model_col;
+ gint view_col;
+ gint row;
AtkStateSet *state_set;
GList *action_list;
gint action_idle_handler;
@@ -76,16 +76,16 @@ GType gal_a11y_e_cell_get_type (void);
AtkObject *gal_a11y_e_cell_new (ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
void gal_a11y_e_cell_construct (AtkObject *object,
ETableItem *item,
ECellView *cell_view,
AtkObject *parent,
- int model_col,
- int view_col,
- int row);
+ gint model_col,
+ gint view_col,
+ gint row);
void gal_a11y_e_cell_type_add_action_interface (GType type);
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index ed417e1601..e36fe51a00 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -36,7 +36,7 @@
static AtkObjectClass *parent_class;
static GType parent_type;
static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETableClickToAddPrivate *) (((char *) object) + priv_offset))
+#define GET_PRIVATE(object) ((GalA11yETableClickToAddPrivate *) (((gchar *) object) + priv_offset))
#define PARENT_TYPE (parent_type)
struct _GalA11yETableClickToAddPrivate {
@@ -51,7 +51,7 @@ etcta_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
etcta_get_description (AtkAction *action,
gint i)
{
@@ -61,7 +61,7 @@ etcta_get_description (AtkAction *action,
return NULL;
}
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
etcta_action_get_name (AtkAction *action, gint i)
{
if (i == 0)
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c
index 4df75cc564..41e6ab0fca 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.c
+++ b/a11y/e-table/gal-a11y-e-table-column-header.c
@@ -32,7 +32,7 @@
static GObjectClass *parent_class;
static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETableColumnHeaderPrivate *) (((char *) object) + priv_offset))
+#define GET_PRIVATE(object) ((GalA11yETableColumnHeaderPrivate *) (((gchar *) object) + priv_offset))
#define PARENT_TYPE (atk_gobject_accessible_get_type ())
struct _GalA11yETableColumnHeaderPrivate {
@@ -141,7 +141,7 @@ gal_a11y_e_table_column_header_get_n_actions (AtkAction *action)
return 1;
}
-static G_CONST_RETURN gchar*
+static G_CONST_RETURN gchar *
gal_a11y_e_table_column_header_action_get_name (AtkAction *action,
gint i)
{
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index 935f53b83b..912d055964 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -48,14 +48,14 @@ static AtkComponentIface *component_parent_iface;
static GType parent_type;
static gint priv_offset;
static GQuark quark_accessible_object = 0;
-#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((char *) object) + priv_offset))
+#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((gchar *) object) + priv_offset))
#define PARENT_TYPE (parent_type)
struct _GalA11yETableItemPrivate {
gint cols;
gint rows;
- int selection_change_id;
- int cursor_change_id;
+ gint selection_change_id;
+ gint cursor_change_id;
ETableCol ** columns;
ESelectionModel *selection;
AtkStateSet *state_set;
@@ -93,7 +93,7 @@ eti_ref_state_set (AtkObject *accessible)
}
inline static gint
-view_to_model_row(ETableItem *eti, int row)
+view_to_model_row(ETableItem *eti, gint row)
{
if (eti->uses_source_model) {
ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
@@ -107,16 +107,16 @@ view_to_model_row(ETableItem *eti, int row)
}
inline static gint
-view_to_model_col(ETableItem *eti, int col)
+view_to_model_col(ETableItem *eti, gint col)
{
ETableCol *ecol = e_table_header_get_column (eti->header, col);
return ecol ? ecol->col_idx : -1;
}
inline static gint
-model_to_view_row(ETableItem *eti, int row)
+model_to_view_row(ETableItem *eti, gint row)
{
- int i;
+ gint i;
if (row == -1)
return -1;
if (eti->uses_source_model) {
@@ -136,9 +136,9 @@ model_to_view_row(ETableItem *eti, int row)
}
inline static gint
-model_to_view_col(ETableItem *eti, int col)
+model_to_view_col(ETableItem *eti, gint col)
{
- int i;
+ gint i;
if (col == -1)
return -1;
for (i = 0; i < eti->cols; i++) {
@@ -159,7 +159,7 @@ static void
eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean notify)
{
ESelectionModel * esm;
- int cursor_row, cursor_col, view_row, view_col;
+ gint cursor_row, cursor_col, view_row, view_col;
AtkObject *cell, *old_cell;
esm = item->selection;
@@ -284,9 +284,9 @@ eti_ref_accessible_at_point (AtkComponent *component,
gint y,
AtkCoordType coord_type)
{
- int row = -1;
- int col = -1;
- int x_origin, y_origin;
+ gint row = -1;
+ gint col = -1;
+ gint x_origin, y_origin;
ETableItem *item;
GtkWidget *tableOrTree;
@@ -446,7 +446,7 @@ eti_get_column_extent_at (AtkTable *table,
gint column)
{
ETableItem *item;
- int width;
+ gint width;
item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
if (!item)
@@ -469,7 +469,7 @@ eti_get_row_extent_at (AtkTable *table,
gint column)
{
ETableItem *item;
- int height;
+ gint height;
item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
if (!item)
@@ -676,7 +676,7 @@ eti_atk_component_iface_init (AtkComponentIface *iface)
}
static void
-eti_rows_inserted (ETableModel * model, int row, int count,
+eti_rows_inserted (ETableModel * model, gint row, gint count,
AtkObject * table_item)
{
gint n_cols,n_rows,i,j;
@@ -711,7 +711,7 @@ eti_rows_inserted (ETableModel * model, int row, int count,
}
static void
-eti_rows_deleted (ETableModel * model, int row, int count,
+eti_rows_deleted (ETableModel * model, gint row, gint count,
AtkObject * table_item)
{
gint i,j, n_rows, n_cols, old_nrows;
@@ -949,7 +949,7 @@ static void eti_a11y_selection_model_added_cb (ETableItem *eti,
static void eti_a11y_selection_changed_cb (ESelectionModel *selection,
GalA11yETableItem *a11y);
static void eti_a11y_cursor_changed_cb (ESelectionModel *selection,
- int row, int col,
+ gint row, gint col,
GalA11yETableItem *a11y);
/**
@@ -1021,7 +1021,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
AtkObject *accessible;
ESelectionModel * esm;
AtkObject *parent;
- const char *name;
+ const gchar *name;
g_return_val_if_fail (item && item->cols >= 0 && item->rows >= 0, NULL);
a11y = g_object_new (gal_a11y_e_table_item_get_type (), NULL);
@@ -1188,7 +1188,7 @@ eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a1
static void
eti_a11y_cursor_changed_cb (ESelectionModel *selection,
- int row, int col, GalA11yETableItem *a11y)
+ gint row, gint col, GalA11yETableItem *a11y)
{
ETableItem *item;
GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index 1966fb29ee..bf75227af4 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -37,7 +37,7 @@
static AtkObjectClass *parent_class;
static GType parent_type;
static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((char *) object) + priv_offset))
+#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((gchar *) object) + priv_offset))
#define PARENT_TYPE (parent_type)
struct _GalA11yETablePrivate {
@@ -125,7 +125,7 @@ et_get_n_children (AtkObject *accessible)
{
GalA11yETable *a11y = GAL_A11Y_E_TABLE (accessible);
ETable * et;
- int n = 0;
+ gint n = 0;
et = E_TABLE(GTK_ACCESSIBLE (a11y)->widget);
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index 4ecce81501..879b517aab 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -34,7 +34,7 @@
static AtkObjectClass *parent_class;
static GType parent_type;
static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((char *) object) + priv_offset))
+#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((gchar *) object) + priv_offset))
#define PARENT_TYPE (parent_type)
struct _GalA11yETreePrivate {