diff options
Diffstat (limited to 'a11y')
| -rw-r--r-- | a11y/ChangeLog | 6 | ||||
| -rw-r--r-- | a11y/e-table/gal-a11y-e-cell-text.c | 6 | ||||
| -rw-r--r-- | a11y/e-table/gal-a11y-e-cell-vbox.c | 16 |
3 files changed, 20 insertions, 8 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 255a874e3e..0b33665712 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,9 @@ +2007-03-27 Matthew Barnes <mbarnes@redhat.com> + + * e-table/gal-a11y-e-cell-text.c: + * e-table/gal-a11y-e-cell-vbox.c: + Don't mix declarations and code (#405495). + 2007-03-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #419524 diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index d751af1452..baee1c3cbc 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -152,11 +152,12 @@ ect_get_character_at_offset (AtkText *text, GalA11yECell *gaec = GAL_A11Y_E_CELL (text); gunichar ret_val; gchar *at_offset; + gchar *full_text; if (!ect_check (text)) return -1; - gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); at_offset = g_utf8_offset_to_pointer (full_text, offset); ret_val = g_utf8_get_char_validated (at_offset, -1); g_free (full_text); @@ -236,11 +237,12 @@ ect_get_character_count (AtkText *text) { GalA11yECell *gaec = GAL_A11Y_E_CELL (text); gint ret_val; + gchar *full_text; if (!ect_check (text)) return -1; - gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ret_val = g_utf8_strlen (full_text, -1); g_free (full_text); diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index 0a5125338c..a3ba582e91 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -36,8 +36,8 @@ static gint ecv_get_n_children (AtkObject *a11y) { g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0); - GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); - return (gaev->a11y_subcell_count); + + return GAL_A11Y_E_CELL_VBOX (a11y)->a11y_subcell_count; } static void @@ -67,10 +67,11 @@ ecv_ref_child (AtkObject *a11y, gint i) AtkObject *ret; if (i < gaev->a11y_subcell_count) { if (gaev->a11y_subcells[i] == NULL) { + ECellView *subcell_view; gint model_col, row; row = gaec->row; model_col = ecvv->model_cols[i]; - ECellView *subcell_view = ecvv->subcell_views[i]; + subcell_view = ecvv->subcell_views[i]; ret = gal_a11y_e_cell_registry_get_object (NULL, gaec->item, subcell_view, @@ -204,14 +205,17 @@ AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, int row) { AtkObject *a11y; + GalA11yECell *gaec; + GalA11yECellVbox *gaev; + ECellVboxView *ecvv; a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL); gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row); - GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y); - GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); - ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view); + gaec = GAL_A11Y_E_CELL (a11y); + gaev = GAL_A11Y_E_CELL_VBOX (a11y); + ecvv = (ECellVboxView *) (gaec->cell_view); gaev->a11y_subcell_count = ecvv->subcell_view_count; gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); return a11y; |