aboutsummaryrefslogtreecommitdiffstats
path: root/a11y/e-table
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-03-27 19:28:14 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-03-27 19:28:14 +0800
commitc8d411ce2bc362cc76ad6d820e7397b3e8a01c3d (patch)
treec38e2d6abe33e2ea0564e36bc150897fc3fbb8fb /a11y/e-table
parentb835359be0b9d33022dee7c815ebde9194eee2cf (diff)
downloadgsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar.gz
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar.bz2
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar.lz
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar.xz
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.tar.zst
gsoc2013-evolution-c8d411ce2bc362cc76ad6d820e7397b3e8a01c3d.zip
Don't mix declarations and code (#405495).
2007-03-27 Matthew Barnes <mbarnes@redhat.com> * a11y/e-table/gal-a11y-e-cell-text.c: * a11y/e-table/gal-a11y-e-cell-vbox.c: * addressbook/gui/component/addressbook-component.c: * addressbook/gui/component/addressbook-view.c: * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/contact-editor/e-contact-quick-add.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/gui/widgets/eab-contact-display.c: * addressbook/gui/widgets/gal-view-minicard.c: * calendar/gui/alarm-notify/alarm-queue.c: * calendar/gui/dialogs/comp-editor.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/dialogs/memo-page.c: * calendar/gui/dialogs/task-page.c: * calendar/gui/e-cal-popup.c: * calendar/gui/e-meeting-list-view.c: * calendar/gui/e-tasks.c: * calendar/gui/gnome-cal.c: * composer/e-msg-composer.c: * mail/em-folder-browser.c: * mail/em-format.c: * mail/em-popup.c: * plugins/exchange-operations/exchange-account-setup.c: * plugins/exchange-operations/exchange-calendar.c: * plugins/exchange-operations/exchange-config-listener.c: * plugins/exchange-operations/exchange-contacts.c: * plugins/import-ics-attachments/icsimporter.c: * widgets/misc/e-filter-bar.c: * widgets/misc/e-multi-config-dialog.c: * widgets/table/e-cell-checkbox.c: * widgets/table/e-table-header-item.c: Don't mix declarations and code (#405495). svn path=/trunk/; revision=33324
Diffstat (limited to 'a11y/e-table')
-rw-r--r--a11y/e-table/gal-a11y-e-cell-text.c6
-rw-r--r--a11y/e-table/gal-a11y-e-cell-vbox.c16
2 files changed, 14 insertions, 8 deletions
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;