From 9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 14 Nov 2007 22:04:21 +0000 Subject: ** Remove trailing whitespace from source code. 2007-11-14 Matthew Barnes ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537 --- a11y/addressbook/ea-addressbook-view.c | 4 +- a11y/addressbook/ea-addressbook-view.h | 2 +- a11y/addressbook/ea-minicard-view.c | 46 +++++++------- a11y/addressbook/ea-minicard-view.h | 2 +- a11y/addressbook/ea-minicard.c | 20 +++--- a11y/addressbook/ea-minicard.h | 4 +- a11y/calendar/ea-cal-view-event.c | 20 +++--- a11y/calendar/ea-cal-view.c | 4 +- a11y/calendar/ea-calendar-helpers.c | 4 +- a11y/calendar/ea-calendar.c | 4 +- a11y/calendar/ea-day-view-cell.c | 8 +-- a11y/calendar/ea-day-view-main-item.c | 62 +++++++++---------- a11y/calendar/ea-day-view.c | 14 ++--- a11y/calendar/ea-gnome-calendar.c | 2 +- a11y/calendar/ea-jump-button.c | 6 +- a11y/calendar/ea-week-view-cell.c | 16 ++--- a11y/calendar/ea-week-view-main-item.c | 72 +++++++++++----------- a11y/calendar/ea-week-view.c | 4 +- a11y/e-table/gal-a11y-e-cell-popup.c | 14 ++--- a11y/e-table/gal-a11y-e-cell-registry.c | 8 +-- a11y/e-table/gal-a11y-e-cell-text.c | 28 ++++----- a11y/e-table/gal-a11y-e-cell-toggle.c | 10 +-- a11y/e-table/gal-a11y-e-cell-tree.c | 8 +-- a11y/e-table/gal-a11y-e-cell-vbox.c | 12 ++-- a11y/e-table/gal-a11y-e-cell-vbox.h | 6 +- a11y/e-table/gal-a11y-e-cell.c | 46 +++++++------- a11y/e-table/gal-a11y-e-cell.h | 6 +- .../gal-a11y-e-table-click-to-add-factory.c | 6 +- a11y/e-table/gal-a11y-e-table-click-to-add.c | 18 +++--- a11y/e-table/gal-a11y-e-table-column-header.c | 6 +- a11y/e-table/gal-a11y-e-table-factory.c | 8 +-- a11y/e-table/gal-a11y-e-table-item-factory.c | 8 +-- a11y/e-table/gal-a11y-e-table-item.c | 62 +++++++++---------- a11y/e-table/gal-a11y-e-table.c | 14 ++--- a11y/e-table/gal-a11y-e-tree-factory.c | 6 +- a11y/e-table/gal-a11y-e-tree.c | 6 +- a11y/e-text/gal-a11y-e-text-factory.c | 8 +-- a11y/e-text/gal-a11y-e-text.c | 20 +++--- a11y/ea-factory.h | 2 +- a11y/gal-a11y-factory.h | 2 +- a11y/gal-a11y-util.c | 2 +- a11y/widgets/ea-calendar-cell.c | 12 ++-- a11y/widgets/ea-calendar-item.c | 62 +++++++++---------- a11y/widgets/ea-combo-button.c | 4 +- a11y/widgets/ea-expander.c | 2 +- 45 files changed, 340 insertions(+), 340 deletions(-) (limited to 'a11y') diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 67b4c6318d..62981ebca1 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-addressbook-view.c * Copyright (C) 2000 Ximian, Inc. * @@ -103,7 +103,7 @@ ea_ab_view_get_description (AtkObject *accessible) return _("evolution addressbook"); } -AtkObject* +AtkObject* ea_ab_view_new (GObject *obj) { GObject *object; diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index d1498d98c1..2fe13ca2c2 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-addressbook_view.h * Copyright (C) 2000 Ximian, Inc. * diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index c6b7d4b029..52f923eb24 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -1,8 +1,8 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-minicard-view.c * Copyright (C) 2000 Ximian, Inc. - * Author: Leon Zhang < leon.zhang@sun.com> + * Author: Leon Zhang < leon.zhang@sun.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -90,13 +90,13 @@ ea_minicard_view_get_type (void) (GInterfaceFinalizeFunc) NULL, NULL }; - + static const GInterfaceInfo atk_action_info = { (GInterfaceInitFunc) atk_action_interface_init, (GInterfaceFinalizeFunc) NULL, NULL }; - + /* * Figure out the size of the class and instance * we are run-time deriving from (GailWidget, in this case) */ @@ -115,7 +115,7 @@ ea_minicard_view_get_type (void) &atk_selection_info); g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); - + } return type; @@ -150,7 +150,7 @@ ea_minicard_view_get_name (AtkObject *accessible) if (!reflow) return NULL; - + /* Get the current name of minicard view*/ card_view = E_MINICARD_VIEW (reflow); g_object_get (card_view->adapter, "book", &book, NULL); @@ -179,7 +179,7 @@ ea_minicard_view_get_description (AtkObject *accessible) return _("evolution addressbook"); } -AtkObject* +AtkObject* ea_minicard_view_new (GObject *obj) { GObject *object; @@ -197,18 +197,18 @@ static gint ea_minicard_view_get_n_children (AtkObject *accessible) { EReflow *reflow; - + gint child_num = 0; - + g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), -1); - + reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible))); if (!reflow) return -1; - + child_num = reflow->count; - + return child_num; } @@ -216,7 +216,7 @@ static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj) { AtkStateSet *state_set = NULL; GObject *gobj = NULL; - + state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj); if( !state_set ) state_set = atk_state_set_new (); @@ -224,7 +224,7 @@ static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj) gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj)); if( !gobj ) return state_set; - + atk_state_set_add_state (state_set, ATK_STATE_ENABLED); atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); atk_state_set_add_state (state_set, ATK_STATE_SHOWING); @@ -241,11 +241,11 @@ ea_minicard_view_ref_child (AtkObject *accessible, gint index) EMinicard *card = NULL; g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL); - + child_num = atk_object_get_n_accessible_children (accessible); if (child_num <= 0 || index < 0 || index >= child_num) return NULL; - + reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible))); if (!reflow) return NULL; @@ -282,13 +282,13 @@ selection_interface_add_selection (AtkSelection *selection, gint i) { AtkGObjectAccessible *atk_gobj= NULL; EReflow *reflow = NULL; - + atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection); reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); - + if (!reflow) return FALSE; - + selection_interface_clear_selection (selection); e_selection_model_select_single_row (reflow->selection, i); @@ -306,9 +306,9 @@ selection_interface_clear_selection (AtkSelection *selection) if( !reflow ) return FALSE; - + e_selection_model_clear (reflow->selection); - + return TRUE; } @@ -329,7 +329,7 @@ selection_interface_get_selection_count (AtkSelection *selection) if (!reflow ) return FALSE; - + return e_selection_model_selected_count (reflow->selection); } @@ -417,4 +417,4 @@ atk_action_interface_get_name (AtkAction *iface, gint i) return action_name[i]; } - + diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h index c0046e0e61..01f73c1494 100644 --- a/a11y/addressbook/ea-minicard-view.h +++ b/a11y/addressbook/ea-minicard-view.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-minicard-view.h * Copyright (C) 2000 Ximian, Inc. * Author: Leon Zhang Sun Microsystem Inc., 2003 diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index 8d4e41082b..888b7423de 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-minicard.c * Copyright (C) 2000 Ximian, Inc. * @@ -79,7 +79,7 @@ ea_minicard_get_type (void) /* * Figure out the size of the class and instance - * we are run-time deriving from (GailWidget, in this case) + * we are run-time deriving from (GailWidget, in this case) */ factory = atk_registry_get_factory (atk_get_default_registry (), @@ -93,7 +93,7 @@ ea_minicard_get_type (void) type = g_type_register_static ( derived_atk_type, "EaMinicard", &tinfo, 0); g_type_add_interface_static (type, ATK_TYPE_ACTION, - &atk_action_info); + &atk_action_info); } return type; @@ -114,14 +114,14 @@ ea_minicard_class_init (EaMinicardClass *klass) } /* - * we access the main content of current minicard, including + * we access the main content of current minicard, including * header text, label(field, field name) */ static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible) { #define BUFFERSIZE 500 - + static gchar name[BUFFERSIZE]; GString *new_str = g_string_new (NULL); gchar *string; @@ -130,7 +130,7 @@ ea_minicard_get_name (AtkObject *accessible) g_return_val_if_fail (EA_IS_MINICARD(accessible), NULL); memset (name, '\0', BUFFERSIZE); - card = E_MINICARD(atk_gobject_accessible_get_object + card = E_MINICARD(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible))); if (!card) return NULL; @@ -140,7 +140,7 @@ ea_minicard_get_name (AtkObject *accessible) if (e_contact_get (card->contact, E_CONTACT_IS_LIST)) g_string_append (new_str, _("Contact List: ")); else g_string_append (new_str, _("Contact: ")); - + /* get header of current card */ g_string_append (new_str, string); g_free (string); @@ -168,7 +168,7 @@ ea_minicard_get_description (AtkObject *accessible) return _("evolution minicard"); } -AtkObject* +AtkObject* ea_minicard_new (GObject *obj) { GObject *object; @@ -267,7 +267,7 @@ atk_action_interface_get_name (AtkAction *iface, gint i) { if( i >= G_N_ELEMENTS (action_name) || i < 0) return NULL; - + return action_name[i]; } - + diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h index bb184762e4..e745a6acff 100644 --- a/a11y/addressbook/ea-minicard.h +++ b/a11y/addressbook/ea-minicard.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * ea-minicard.h * Copyright (C) 2000 Ximian, Inc. * @@ -16,7 +16,7 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - * + * * Author: Leon Zhang Sun Microsystem Inc., 2003 */ #ifndef __EA_MINICARD_H__ diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 9f7e694597..a85ce348c6 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -114,7 +114,7 @@ ea_cal_view_event_get_type (void) g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); - + } return type; @@ -164,7 +164,7 @@ static void ea_cal_view_finalize (GObject *object) } #endif -AtkObject* +AtkObject* ea_cal_view_event_new (GObject *obj) { AtkObject *atk_obj = NULL; @@ -262,21 +262,21 @@ ea_cal_view_event_get_name (AtkObject *accessible) alarm_string = recur_string = meeting_string = ""; if (event && event->comp_data) { - if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) + if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) alarm_string = _("It has alarms."); - if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) + if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) recur_string = _("It has recurrences."); - if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) + if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) meeting_string = _("It is a meeting."); - + } summary = icalcomponent_get_summary (event->comp_data->icalcomp); - if (summary) + if (summary) summary_string = g_strdup_printf (_("Calendar Event: Summary is %s."), summary); - else + else summary_string = g_strdup (_("Calendar Event: It has no summary.")); name_string = g_strdup_printf ("%s %s %s %s", summary_string, alarm_string, recur_string, meeting_string); @@ -410,7 +410,7 @@ ea_cal_view_event_ref_state_set (AtkObject *accessible) /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -418,7 +418,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->get_extents = ea_cal_view_get_extents; } -static void +static void ea_cal_view_get_extents (AtkComponent *component, gint *x, gint *y, diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index ad52976ca1..9ce7a11fc8 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -118,7 +118,7 @@ ea_cal_view_class_init (EaCalViewClass *klass) class->initialize = ea_cal_view_real_initialize; } -AtkObject* +AtkObject* ea_cal_view_new (GtkWidget *widget) { GObject *object; @@ -169,7 +169,7 @@ ea_cal_view_real_initialize (AtkObject *accessible, gpointer data) accessible); } -static AtkObject* +static AtkObject* ea_cal_view_get_parent (AtkObject *accessible) { ECalendarView *cal_view; diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c index caf1913829..aff9f0c771 100644 --- a/a11y/calendar/ea-calendar-helpers.c +++ b/a11y/calendar/ea-calendar-helpers.c @@ -36,7 +36,7 @@ * ea_calendar_helpers_get_accessible_for * @canvas_item: the canvas item for a event or a jump button * @returns: the atk object for the canvas_item - * + * **/ AtkObject * ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item) @@ -71,7 +71,7 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item) * @returns: the cal view widget if exists * * Get the cal view widget contains the canvas_item. - * + * **/ ECalendarView * ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item) diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c index 8c2167fac5..be9c48d594 100644 --- a/a11y/calendar/ea-calendar.c +++ b/a11y/calendar/ea-calendar.c @@ -107,7 +107,7 @@ e_day_view_a11y_init (void) EA_SET_FACTORY (e_day_view_get_type(), ea_day_view); } -void +void e_day_view_main_item_a11y_init (void) { EA_SET_FACTORY (e_day_view_main_item_get_type (), ea_day_view_main_item); @@ -119,7 +119,7 @@ e_week_view_a11y_init (void) EA_SET_FACTORY (e_week_view_get_type(), ea_week_view); } -void +void e_week_view_main_item_a11y_init (void) { EA_SET_FACTORY (e_week_view_main_item_get_type (), ea_week_view_main_item); diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c index b32dc4d0f0..ec1718225a 100644 --- a/a11y/calendar/ea-day-view-cell.c +++ b/a11y/calendar/ea-day-view-cell.c @@ -166,7 +166,7 @@ ea_day_view_cell_class_init (EaDayViewCellClass *klass) class->get_index_in_parent = ea_day_view_cell_get_index_in_parent; } -AtkObject* +AtkObject* ea_day_view_cell_new (GObject *obj) { gpointer object; @@ -263,7 +263,7 @@ ea_day_view_cell_ref_state_set (AtkObject *obj) if (x + width < parent_x || x > parent_x + parent_width || y + height < parent_y || y > parent_y + parent_height) - /* the cell is out of the main canvas */ + /* the cell is out of the main canvas */ ; else atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); @@ -312,7 +312,7 @@ ea_day_view_cell_get_index_in_parent (AtkObject *accessible) /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -321,7 +321,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->grab_focus = component_interface_grab_focus; } -static void +static void component_interface_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index 1889b9cf17..658df70cd2 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -63,7 +63,7 @@ static gint table_interface_get_column_at_index (AtkTable *table, static gint table_interface_get_row_at_index (AtkTable *table, gint index); static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column); static gint table_interface_get_n_rows (AtkTable *table); static gint table_interface_get_n_columns (AtkTable *table); @@ -229,7 +229,7 @@ ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass) class->get_index_in_parent = ea_day_view_main_item_get_index_in_parent; } -AtkObject* +AtkObject* ea_day_view_main_item_new (GObject *obj) { AtkObject *accessible; @@ -451,7 +451,7 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data) "active-descendant-changed", item_cell); g_signal_emit_by_name (data, "selection_changed"); - + atk_focus_tracker_notify (item_cell); g_object_unref (item_cell); } @@ -618,7 +618,7 @@ ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item) /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -626,7 +626,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->get_extents = component_interface_get_extents; } -static void +static void component_interface_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) @@ -654,7 +654,7 @@ component_interface_get_extents (AtkComponent *component, /* atk table interface */ -static void +static void atk_table_interface_init (AtkTableIface *iface) { g_return_if_fail (iface != NULL); @@ -687,9 +687,9 @@ atk_table_interface_init (AtkTableIface *iface) iface->get_column_description = table_interface_get_column_description; } -static AtkObject* +static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column) { gint index; @@ -700,7 +700,7 @@ table_interface_ref_at (AtkTable *table, return ea_day_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index); } -static gint +static gint table_interface_get_n_rows (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -720,7 +720,7 @@ table_interface_get_n_rows (AtkTable *table) return day_view->rows; } -static gint +static gint table_interface_get_n_columns (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -787,7 +787,7 @@ table_interface_get_column_extent_at (AtkTable *table, return width; } -static gint +static gint table_interface_get_row_extent_at (AtkTable *table, gint row, gint column) @@ -808,7 +808,7 @@ table_interface_get_row_extent_at (AtkTable *table, return height; } -static gboolean +static gboolean table_interface_is_row_selected (AtkTable *table, gint row) { @@ -838,16 +838,16 @@ table_interface_is_row_selected (AtkTable *table, return FALSE; } -static gboolean -table_interface_is_selected (AtkTable *table, - gint row, +static gboolean +table_interface_is_selected (AtkTable *table, + gint row, gint column) { return table_interface_is_row_selected (table, row) && table_interface_is_column_selected (table, column); } -static gboolean +static gboolean table_interface_is_column_selected (AtkTable *table, gint column) { @@ -871,7 +871,7 @@ table_interface_is_column_selected (AtkTable *table, return FALSE; } -static gint +static gint table_interface_get_selected_rows (AtkTable *table, gint **rows_selected) { @@ -912,7 +912,7 @@ table_interface_get_selected_rows (AtkTable *table, return n_rows; } -static gint +static gint table_interface_get_selected_columns (AtkTable *table, gint **columns_selected) { @@ -946,8 +946,8 @@ table_interface_get_selected_columns (AtkTable *table, return n_columns; } -static gboolean -table_interface_add_row_selection (AtkTable *table, +static gboolean +table_interface_add_row_selection (AtkTable *table, gint row) { AtkGObjectAccessible *atk_gobj; @@ -979,15 +979,15 @@ table_interface_add_row_selection (AtkTable *table, return TRUE; } -static gboolean -table_interface_remove_row_selection (AtkTable *table, +static gboolean +table_interface_remove_row_selection (AtkTable *table, gint row) { return FALSE; } -static gboolean -table_interface_add_column_selection (AtkTable *table, +static gboolean +table_interface_add_column_selection (AtkTable *table, gint column) { AtkGObjectAccessible *atk_gobj; @@ -1016,24 +1016,24 @@ table_interface_add_column_selection (AtkTable *table, return TRUE; } -static gboolean -table_interface_remove_column_selection (AtkTable *table, +static gboolean +table_interface_remove_column_selection (AtkTable *table, gint column) { /* FIXME: NOT IMPLEMENTED */ return FALSE; } -static AtkObject* -table_interface_get_row_header (AtkTable *table, +static AtkObject* +table_interface_get_row_header (AtkTable *table, gint row) { /* FIXME: NOT IMPLEMENTED */ return NULL; } -static AtkObject* -table_interface_get_column_header (AtkTable *table, +static AtkObject* +table_interface_get_column_header (AtkTable *table, gint in_col) { /* FIXME: NOT IMPLEMENTED */ @@ -1202,7 +1202,7 @@ selection_interface_clear_selection (AtkSelection *selection) return TRUE; } -static AtkObject* +static AtkObject* selection_interface_ref_selection (AtkSelection *selection, gint i) { gint count; diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c index 8a397c8fe2..66537c0f3f 100644 --- a/a11y/calendar/ea-day-view.c +++ b/a11y/calendar/ea-day-view.c @@ -100,7 +100,7 @@ ea_day_view_class_init (EaDayViewClass *klass) class->ref_child = ea_day_view_ref_child; } -AtkObject* +AtkObject* ea_day_view_new (GtkWidget *widget) { GObject *object; @@ -146,24 +146,24 @@ ea_day_view_get_name (AtkObject *accessible) /* the child main item is always there */ --n_events; if (n_events >= 1) - /* To translators: Here, "It" is either like "Work Week View: July + /* To translators: Here, "It" is either like "Work Week View: July 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */ event_str = g_strdup_printf (ngettext ("It has %d event.", "It has %d events.", n_events), n_events); else - /* To translators: Here, "It" is either like "Work Week View: July + /* To translators: Here, "It" is either like "Work Week View: July 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006." */ event_str = g_strdup (_("It has no events.")); view_type = gnome_calendar_get_view (gcal); if (view_type == GNOME_CAL_WORK_WEEK_VIEW) - /* To translators: First %s is the week, for example "July 10th - - July 14th, 2006". Second %s is the number of events in this work + /* To translators: First %s is the week, for example "July 10th - + July 14th, 2006". Second %s is the number of events in this work week, for example "It has %d event/events." or "It has no events." */ name_str = g_strdup_printf (_("Work Week View: %s. %s"), label_text, event_str); else - /* To translators: First %s is the day, for example "Thursday July - 13th, 2006". Second %s is the number of events on this day, for + /* To translators: First %s is the day, for example "Thursday July + 13th, 2006". Second %s is the number of events on this day, for example "It has %d event/events." or "It has no events." */ name_str = g_strdup_printf (_("Day View: %s. %s"), label_text, event_str); diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index 509d515f2d..6de483f952 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -100,7 +100,7 @@ ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass) class->ref_child = ea_gnome_calendar_ref_child; } -AtkObject* +AtkObject* ea_gnome_calendar_new (GtkWidget *widget) { GObject *object; diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c index 45dcc3fe06..2d239091a9 100644 --- a/a11y/calendar/ea-jump-button.c +++ b/a11y/calendar/ea-jump-button.c @@ -110,7 +110,7 @@ ea_jump_button_class_init (EaJumpButtonClass *klass) class->get_description = ea_jump_button_get_description; } -AtkObject* +AtkObject* ea_jump_button_new (GObject *obj) { AtkObject *atk_obj = NULL; @@ -197,7 +197,7 @@ jump_button_do_action (AtkAction *action, return_value = FALSE; break; } - return return_value; + return return_value; } static gint @@ -222,5 +222,5 @@ jump_button_get_keybinding (AtkAction *action, default: break; } - return return_value; + return return_value; } diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c index b557812f4b..0ee410b5f5 100644 --- a/a11y/calendar/ea-week-view-cell.c +++ b/a11y/calendar/ea-week-view-cell.c @@ -167,7 +167,7 @@ ea_week_view_cell_class_init (EaWeekViewCellClass *klass) } -AtkObject* +AtkObject* ea_week_view_cell_new (GObject *obj) { gpointer object; @@ -232,7 +232,7 @@ ea_week_view_cell_get_name (AtkObject *accessible) new_column = cell->column + start_day; new_row = cell->row; } - + column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item), new_column); row_label = atk_table_get_row_description (ATK_TABLE (ea_main_item), @@ -275,7 +275,7 @@ ea_week_view_cell_ref_state_set (AtkObject *obj) if (x + width < parent_x || x > parent_x + parent_width || y + height < parent_y || y > parent_y + parent_height) - /* the cell is out of the main canvas */ + /* the cell is out of the main canvas */ ; else atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); @@ -324,7 +324,7 @@ ea_week_view_cell_get_index_in_parent (AtkObject *accessible) /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -333,7 +333,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->grab_focus = component_interface_grab_focus; } -static void +static void component_interface_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) @@ -391,7 +391,7 @@ component_interface_get_extents (AtkComponent *component, *y += week_view->row_offsets[cell->row*2]- scroll_y; } } else { - if (start_day < 3) { + if (start_day < 3) { if (cell->column < 3) { *height = week_view->row_heights[cell->column*2]*2; *width = week_view->col_widths[0]; @@ -438,8 +438,8 @@ component_interface_get_extents (AtkComponent *component, *y += week_view->row_offsets[(cell->column - 1)*2]- scroll_y; } else { *height = week_view->row_heights[(cell->column)*2]*2; - *width = week_view->col_widths[0]; - *x += week_view->col_offsets[0] - scroll_x; + *width = week_view->col_widths[0]; + *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[cell->column*2]- scroll_y; } } else { diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 17220fd185..01c6f0236e 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -64,7 +64,7 @@ static gint table_interface_get_column_at_index (AtkTable *table, static gint table_interface_get_row_at_index (AtkTable *table, gint index); static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column); static gint table_interface_get_n_rows (AtkTable *table); static gint table_interface_get_n_columns (AtkTable *table); @@ -183,7 +183,7 @@ ea_week_view_main_item_get_type (void) (GInterfaceFinalizeFunc) NULL, NULL }; - + /* * Figure out the size of the class and instance @@ -230,7 +230,7 @@ ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass) class->get_index_in_parent = ea_week_view_main_item_get_index_in_parent; } -AtkObject* +AtkObject* ea_week_view_main_item_new (GObject *obj) { AtkObject *accessible; @@ -318,10 +318,10 @@ ea_week_view_main_item_get_n_children (AtkObject *accessible) main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); week_view = main_item->week_view; - + if (week_view->multi_week_view) return 7 * week_view->weeks_shown; - else + else return 7; } @@ -593,7 +593,7 @@ ea_week_view_main_item_destory_cell_data (EaWeekViewMainItem *ea_main_item) /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -601,7 +601,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->get_extents = component_interface_get_extents; } -static void +static void component_interface_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) @@ -629,7 +629,7 @@ component_interface_get_extents (AtkComponent *component, /* atk table interface */ -static void +static void atk_table_interface_init (AtkTableIface *iface) { g_return_if_fail (iface != NULL); @@ -662,9 +662,9 @@ atk_table_interface_init (AtkTableIface *iface) iface->get_column_description = table_interface_get_column_description; } -static AtkObject* +static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column) { gint index; @@ -675,7 +675,7 @@ table_interface_ref_at (AtkTable *table, return ea_week_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index); } -static gint +static gint table_interface_get_n_rows (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -695,7 +695,7 @@ table_interface_get_n_rows (AtkTable *table) return week_view->weeks_shown; } -static gint +static gint table_interface_get_n_columns (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -757,7 +757,7 @@ table_interface_get_column_extent_at (AtkTable *table, return width; } -static gint +static gint table_interface_get_row_extent_at (AtkTable *table, gint row, gint column) @@ -778,7 +778,7 @@ table_interface_get_row_extent_at (AtkTable *table, return height; } -static gboolean +static gboolean table_interface_is_row_selected (AtkTable *table, gint row) { @@ -808,15 +808,15 @@ table_interface_is_row_selected (AtkTable *table, return TRUE; } -static gboolean -table_interface_is_selected (AtkTable *table, - gint row, +static gboolean +table_interface_is_selected (AtkTable *table, + gint row, gint column) { return table_interface_is_row_selected (table, row) && table_interface_is_column_selected(table, column); } -static gboolean +static gboolean table_interface_is_column_selected (AtkTable *table, gint column) { @@ -846,7 +846,7 @@ table_interface_is_column_selected (AtkTable *table, } } -static gint +static gint table_interface_get_selected_rows (AtkTable *table, gint **rows_selected) { @@ -881,7 +881,7 @@ table_interface_get_selected_rows (AtkTable *table, return n_rows; } -static gint +static gint table_interface_get_selected_columns (AtkTable *table, gint **columns_selected) { @@ -911,7 +911,7 @@ table_interface_get_selected_columns (AtkTable *table, } if (n_columns > 0 && start_column != -1 && columns_selected) { gint index; - + *columns_selected = (gint *) g_malloc (n_columns * sizeof (gint)); for (index = 0; index < n_columns; ++index) (*columns_selected)[index] = start_column + index; @@ -919,8 +919,8 @@ table_interface_get_selected_columns (AtkTable *table, return n_columns; } -static gboolean -table_interface_add_row_selection (AtkTable *table, +static gboolean +table_interface_add_row_selection (AtkTable *table, gint row) { AtkGObjectAccessible *atk_gobj; @@ -946,15 +946,15 @@ table_interface_add_row_selection (AtkTable *table, return TRUE; } -static gboolean -table_interface_remove_row_selection (AtkTable *table, +static gboolean +table_interface_remove_row_selection (AtkTable *table, gint row) { return FALSE; } -static gboolean -table_interface_add_column_selection (AtkTable *table, +static gboolean +table_interface_add_column_selection (AtkTable *table, gint column) { AtkGObjectAccessible *atk_gobj; @@ -980,24 +980,24 @@ table_interface_add_column_selection (AtkTable *table, return TRUE; } -static gboolean -table_interface_remove_column_selection (AtkTable *table, +static gboolean +table_interface_remove_column_selection (AtkTable *table, gint column) { /* FIXME: NOT IMPLEMENTED */ return FALSE; } -static AtkObject* -table_interface_get_row_header (AtkTable *table, +static AtkObject* +table_interface_get_row_header (AtkTable *table, gint row) { /* FIXME: NOT IMPLEMENTED */ return NULL; } -static AtkObject* -table_interface_get_column_header (AtkTable *table, +static AtkObject* +table_interface_get_column_header (AtkTable *table, gint in_col) { /* FIXME: NOT IMPLEMENTED */ @@ -1061,7 +1061,7 @@ table_interface_get_column_description (AtkTable *table, default: break; } - + ea_cell_table_set_column_label (cell_data, in_col, buffer); description = ea_cell_table_get_column_label (cell_data, in_col); } @@ -1179,7 +1179,7 @@ selection_interface_clear_selection (AtkSelection *selection) return TRUE; } -static AtkObject* +static AtkObject* selection_interface_ref_selection (AtkSelection *selection, gint i) { gint count; @@ -1244,7 +1244,7 @@ selection_interface_is_child_selected (AtkSelection *selection, gint i) if ((week_view->selection_start_day <= i)&&(week_view->selection_end_day >= i)) return TRUE; - else + else return FALSE; } diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index fb2ce7bdab..c1f1debc2b 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -101,7 +101,7 @@ ea_week_view_class_init (EaWeekViewClass *klass) class->ref_child = ea_week_view_ref_child; } -AtkObject* +AtkObject* ea_week_view_new (GtkWidget *widget) { GObject *object; @@ -273,7 +273,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) /* index == 0 is the main item */ atk_object = atk_gobject_accessible_for_object (G_OBJECT (week_view->main_canvas_item)); g_object_ref (atk_object); - } else + } else for (event_index = 0; event_index < max_count; ++event_index) { EWeekViewEvent *event; EWeekViewEventSpan *span; diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index 64e11bcf98..c0110e9dba 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -43,11 +43,11 @@ static void popup_cell_action (GalA11yECell *cell); /** * gal_a11y_e_cell_popup_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellPopup class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellPopup class. **/ GType @@ -99,7 +99,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, if (popupcell && popupcell->popup_cell_view) child_view = popupcell->popup_cell_view->child_view; - + if (child_view && child_view->ecell) { a11y = gal_a11y_e_cell_registry_get_object (NULL, item, @@ -120,7 +120,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, } g_return_val_if_fail (a11y != NULL, NULL); cell = GAL_A11Y_E_CELL(a11y); - gal_a11y_e_cell_add_action (cell, + gal_a11y_e_cell_add_action (cell, _("popup"), /* action name*/ _("popup a child"), /* action description */ "Down", /* action keybinding */ @@ -136,12 +136,12 @@ popup_cell_action (GalA11yECell *cell) gint finished; GdkEvent event; - event.key.type = GDK_KEY_PRESS; + event.key.type = GDK_KEY_PRESS; event.key.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;; event.key.send_event = TRUE; event.key.time = GDK_CURRENT_TIME; event.key.state = GDK_MOD1_MASK; event.key.keyval = GDK_Down; - + g_signal_emit_by_name (cell->item, "event", &event, &finished); } diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c index 9557ec5464..72ff48e33f 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.c +++ b/a11y/e-table/gal-a11y-e-cell-registry.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -51,11 +51,11 @@ gal_a11y_e_cell_registry_init (GalA11yECellRegistry *registry) /** * gal_a11y_e_cell_registry_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellRegistry class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellRegistry class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index baee1c3cbc..696127ae3b 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -193,7 +193,7 @@ ect_get_caret_offset (AtkText *text) gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); end = g_utf8_pointer_to_offset (full_text, full_text + end); g_free (full_text); - + return end; } else @@ -261,7 +261,7 @@ ect_get_offset_at_point (AtkText *text, } -static gint +static gint ect_get_n_selections (AtkText *text) { GalA11yECell *gaec = GAL_A11Y_E_CELL (text); @@ -344,7 +344,7 @@ ect_add_selection (AtkText *text, real_start = MIN (start_offset, end_offset); real_end = MAX (start_offset, end_offset); - + real_start = MIN (MAX (0, real_start), len); real_end = MIN (MAX (0, real_end), len); @@ -376,7 +376,7 @@ ect_remove_selection (AtkText *text, gaec->view_col, gaec->row, &selection_start, &selection_end) - && selection_start != selection_end + && selection_start != selection_end && e_cell_text_set_selection (gaec->cell_view, gaec->view_col, gaec->row, selection_end, selection_end)) { @@ -418,7 +418,7 @@ ect_set_caret_offset (AtkText *text, offset = len; else offset = MIN (MAX (0, offset), len); - + offset = g_utf8_offset_to_pointer (full_text, offset) - full_text; g_free (full_text); @@ -598,7 +598,7 @@ ect_class_init (GalA11yECellTextClass *klass) { AtkObjectClass *a11y = ATK_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (PARENT_TYPE); a11y->get_name = ect_get_name; object_class->dispose = ect_dispose; @@ -619,11 +619,11 @@ ect_action_init (GalA11yECellText *a11y) /** * gal_a11y_e_cell_text_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellText class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellText class. **/ GType @@ -670,7 +670,7 @@ static void cell_text_destroyed (gpointer data) { g_return_if_fail (GAL_A11Y_IS_E_CELL_TEXT (data)); - + g_object_unref (data); } @@ -685,7 +685,7 @@ gal_a11y_e_cell_text_new (ETableItem *item, AtkObject *a11y; GalA11yECell *gaec; GalA11yECellText *gaet; - ECellText *ect; + ECellText *ect; a11y = g_object_new (gal_a11y_e_cell_text_get_type (), NULL); @@ -701,9 +701,9 @@ gal_a11y_e_cell_text_new (ETableItem *item, /* will be unrefed in cell_text_destroyed */ g_object_ref (a11y); - gaet->inserted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), + gaet->inserted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), "text_inserted", G_CALLBACK (ect_text_inserted_cb), a11y); - gaet->deleted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), + gaet->deleted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), "text_deleted", G_CALLBACK (ect_text_deleted_cb), a11y); g_object_weak_ref (G_OBJECT (((ECellView *)cell_view)->ecell), diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 6d1bbfd45e..8f994adeae 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -47,18 +47,18 @@ gal_a11y_e_cell_toggle_get_type (void) NULL, /* instance init */ NULL /* value table */ }; - + type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, "GalA11yECellToggle", &tinfo, 0); gal_a11y_e_cell_type_add_action_interface (type); - + } return type; } -static void +static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -118,7 +118,7 @@ model_change_cb (ETableModel *etm, } -AtkObject* +AtkObject* gal_a11y_e_cell_toggle_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, @@ -147,7 +147,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, view_col, row); - gal_a11y_e_cell_add_action (cell, + gal_a11y_e_cell_add_action (cell, _("toggle"), /* action name*/ _("toggle the cell"), /* action description */ NULL, /* action keybinding */ diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index abc0c67ddb..a4b68b89ab 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Tim Wo , Sun Microsystem Inc. 2003. * * Copyright (C) 2002 Ximian, Inc. @@ -89,7 +89,7 @@ ectr_do_action_expand (AtkAction *action) ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); @@ -112,7 +112,7 @@ ectr_do_action_collapse (AtkAction *action) ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); @@ -178,7 +178,7 @@ gal_a11y_e_cell_tree_new (ETableItem *item, ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + ECellView *subcell_view; subcell_view = e_cell_tree_view_get_subcell_view (cell_view); diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index caed5d4fc2..268dc51691 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -46,7 +46,7 @@ subcell_destroyed (gpointer data) GalA11yECell *cell; AtkObject *parent; GalA11yECellVbox *gaev; - + g_return_if_fail (GAL_A11Y_IS_E_CELL (data)); cell = GAL_A11Y_E_CELL (data); @@ -199,9 +199,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, + AtkObject *parent, + int model_col, + int view_col, int row) { AtkObject *a11y; @@ -210,13 +210,13 @@ AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, 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); 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_subcell_count = ecvv->subcell_view_count; gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); return a11y; } diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index 121db71671..32a199c05a 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -53,9 +53,9 @@ struct _GalA11yECellVboxClass 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, + AtkObject *parent, + int model_col, + int view_col, int row); #ifdef __cplusplus diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index c19622d2b5..f6372eedc4 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -42,9 +42,9 @@ unref_cell (gpointer user_data, GObject *obj_loc) a11y->cell_view = NULL; g_object_unref (a11y); } -#endif +#endif -static gboolean +static gboolean is_valid (AtkObject *cell) { GalA11yECell *a11y = GAL_A11Y_E_CELL (cell); @@ -113,7 +113,7 @@ gal_a11y_e_cell_ref_state_set (AtkObject *accessible) GalA11yECell *cell = GAL_A11Y_E_CELL (accessible); g_return_val_if_fail (cell->state_set, NULL); - + g_object_ref(cell->state_set); return cell->state_set; @@ -193,10 +193,10 @@ gal_a11y_e_cell_grab_focus (AtkComponent *component) a11yTableItem = GAL_A11Y_E_TABLE_ITEM (a11y->parent); index = atk_object_get_index_in_parent (ATK_OBJECT (a11y)); - + atk_selection_clear_selection (ATK_SELECTION (a11yTableItem)); atk_selection_add_selection (ATK_SELECTION (a11yTableItem), index); - + gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel)) @@ -256,7 +256,7 @@ _gal_a11y_e_cell_get_action_info (GalA11yECell *cell, gint index) { GList *list_node; - + g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), NULL); if (cell->action_list == NULL) return NULL; @@ -290,7 +290,7 @@ gal_a11y_e_cell_add_action ( GalA11yECell * cell, ActionInfo *info; g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE); info = g_new (ActionInfo, 1); - + if (action_name != NULL) info->name = g_strdup (action_name); else @@ -333,7 +333,7 @@ gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, { GList *list_node; gboolean action_found= FALSE; - + g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE); for (list_node = cell->action_list; list_node && !action_found; list_node = list_node->next) { @@ -366,7 +366,7 @@ gal_a11y_e_cell_action_get_name (AtkAction *action, { GalA11yECell *cell = GAL_A11Y_E_CELL(action); ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index); - + if (info == NULL) return NULL; return info->name; @@ -391,7 +391,7 @@ gal_a11y_e_cell_action_set_description (AtkAction *action, { GalA11yECell *cell = GAL_A11Y_E_CELL(action); ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index); - + if (info == NULL) return FALSE; g_free (info->description); @@ -410,7 +410,7 @@ gal_a11y_e_cell_action_get_keybinding (AtkAction *action, return info->keybinding; } - + static gboolean idle_do_action (gpointer data) { @@ -424,7 +424,7 @@ idle_do_action (gpointer data) cell->action_idle_handler = 0; cell->action_func (cell); g_object_unref (cell); - + return FALSE; } @@ -454,7 +454,7 @@ static void gal_a11y_e_cell_atk_action_interface_init (AtkActionIface *iface) { g_return_if_fail (iface != NULL); - + iface->get_n_actions = gal_a11y_e_cell_action_get_n_actions; iface->do_action = gal_a11y_e_cell_action_do_action; iface->get_name = gal_a11y_e_cell_action_get_name; @@ -484,17 +484,17 @@ gal_a11y_e_cell_add_state (GalA11yECell *cell, { if (!atk_state_set_contains_state (cell->state_set, state_type)) { gboolean rc; - + rc = atk_state_set_add_state (cell->state_set, state_type); /* * The signal should only be generated if the value changed, * not when the cell is set up. So states that are set * initially should pass FALSE as the emit_signal argument. */ - + if (emit_signal) { atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE); - /* If state_type is ATK_STATE_VISIBLE, additional + /* If state_type is ATK_STATE_VISIBLE, additional notification */ if (state_type == ATK_STATE_VISIBLE) g_signal_emit_by_name (cell, "visible_data_changed"); @@ -513,7 +513,7 @@ gal_a11y_e_cell_remove_state (GalA11yECell *cell, { if (atk_state_set_contains_state (cell->state_set, state_type)) { gboolean rc; - + rc = atk_state_set_remove_state (cell->state_set, state_type); /* * The signal should only be generated if the value changed, @@ -536,11 +536,11 @@ gal_a11y_e_cell_remove_state (GalA11yECell *cell, /** * gal_a11y_e_cell_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECell class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECell class. **/ GType @@ -616,14 +616,14 @@ gal_a11y_e_cell_construct (AtkObject *object, ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; if (item) - g_object_ref (G_OBJECT (item)); + g_object_ref (G_OBJECT (item)); #if 0 if (parent) g_object_ref (parent); if (cell_view) - g_object_ref (G_OBJECT (cell_view)); + g_object_ref (G_OBJECT (cell_view)); #endif diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index b3f5ef3277..48da764102 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -74,16 +74,16 @@ void gal_a11y_e_cell_construct (AtkObject *object, int row); void gal_a11y_e_cell_type_add_action_interface (GType type); - + gboolean gal_a11y_e_cell_add_action (GalA11yECell *cell, const gchar *action_name, const gchar *action_description, const gchar *action_keybinding, ACTION_FUNC action_func); - + gboolean gal_a11y_e_cell_remove_action (GalA11yECell *cell, gint action_id); - + gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, const gchar *action_name); diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c index ab98b4a10b..2dfa2cb1c4 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c @@ -57,11 +57,11 @@ gal_a11y_e_table_click_to_add_factory_init (GalA11yETableClickToAddFactory *fact /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType 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 819946cbbb..a4905971de 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 @@ -70,14 +70,14 @@ idle_do_action (gpointer data) event.x = 0; event.y = 0; - + event.type = GDK_BUTTON_PRESS; event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(etcta)->canvas)->bin_window; event.button = 1; event.send_event = TRUE; event.time = GDK_CURRENT_TIME; event.axes = NULL; - + g_signal_emit_by_name (etcta, "event", &event, &finished); return FALSE; @@ -97,7 +97,7 @@ static void atk_action_interface_init (AtkActionIface *iface) { g_return_if_fail (iface != NULL); - + iface->do_action = etcta_do_action; iface->get_n_actions = etcta_get_n_actions; iface->get_description = etcta_get_description; @@ -184,11 +184,11 @@ etcta_init (GalA11yETableClickToAdd *a11y) /** * gal_a11y_e_table_click_to_add_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableClickToAdd class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableClickToAdd class. **/ GType @@ -222,9 +222,9 @@ gal_a11y_e_table_click_to_add_get_type (void) parent_type = atk_object_factory_get_accessible_type (factory); type = gal_a11y_type_register_static_with_private (PARENT_TYPE, - "GalA11yETableClickToAdd", &info, 0, + "GalA11yETableClickToAdd", &info, 0, sizeof(GalA11yETableClickToAddPrivate), &priv_offset); - + g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); } @@ -238,7 +238,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data) ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); GalA11yETableClickToAdd *a11y; GalA11yETableClickToAddPrivate *priv; - + g_return_val_if_fail (item, TRUE); g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_CLICK_TO_ADD(data), FALSE); 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 3303978a65..5f060e9cde 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -54,7 +54,7 @@ static void gal_a11y_e_table_column_header_dispose (GObject *object) { GalA11yETableColumnHeader *a11y = GAL_A11Y_E_TABLE_COLUMN_HEADER (object); - GalA11yETableColumnHeaderPrivate *priv = GET_PRIVATE (a11y); + GalA11yETableColumnHeaderPrivate *priv = GET_PRIVATE (a11y); if (priv->state_set) { g_object_unref (priv->state_set); @@ -63,7 +63,7 @@ gal_a11y_e_table_column_header_dispose (GObject *object) if (parent_class->dispose) parent_class->dispose (object); - + } static void @@ -108,7 +108,7 @@ gal_a11y_e_table_column_header_do_action (AtkAction *action, } else if (E_IS_TABLE (widget)) ethi = E_TABLE_HEADER_ITEM (E_TABLE (widget)->header_item); - else + else break; ethi_change_sort_state (ethi, col); default: diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c index 8e207716ce..384dd40ed4 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.c +++ b/a11y/e-table/gal-a11y-e-table-factory.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -51,11 +51,11 @@ gal_a11y_e_table_factory_init (GalA11yETableFactory *factory) /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c index 959de7e718..7841490e77 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.c +++ b/a11y/e-table/gal-a11y-e-table-item-factory.c @@ -34,7 +34,7 @@ gal_a11y_e_table_item_factory_create_accessible (GObject *obj) g_return_val_if_fail (E_IS_TABLE_ITEM(obj), NULL); accessible = gal_a11y_e_table_item_new (E_TABLE_ITEM (obj)); - + return accessible; } @@ -56,11 +56,11 @@ gal_a11y_e_table_item_factory_init (GalA11yETableItemFactory *factory) /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index c11be59787..65c9b4ba22 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * Bolian Yin * @@ -176,7 +176,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean } else g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL); - if (notify && cell) + if (notify && cell) atk_focus_tracker_notify (cell); } @@ -251,7 +251,7 @@ eti_get_extents (AtkComponent *component, parent = ATK_OBJECT (component)->accessible_parent; if (parent && ATK_IS_COMPONENT (parent)) - atk_component_get_extents (ATK_COMPONENT (parent), x, y, + atk_component_get_extents (ATK_COMPONENT (parent), x, y, width, height, coord_type); @@ -313,7 +313,7 @@ cell_destroyed (gpointer data) g_return_if_fail (cell->item && G_IS_OBJECT (cell->item)); if (cell->item) { - g_object_unref (cell->item); + g_object_unref (cell->item); cell->item = NULL; } @@ -354,7 +354,7 @@ eti_ref_at (AtkTable *table, gint row, gint column) (GWeakNotify) cell_destroyed, ret); /* if current cell is focused, add FOCUSED state */ - if (e_selection_model_cursor_row (item->selection) == GAL_A11Y_E_CELL (ret)->row && + if (e_selection_model_cursor_row (item->selection) == GAL_A11Y_E_CELL (ret)->row && e_selection_model_cursor_col (item->selection) == GAL_A11Y_E_CELL (ret)->model_col) gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (ret), ATK_STATE_FOCUSED, FALSE); } else @@ -439,7 +439,7 @@ eti_get_column_extent_at (AtkTable *table, return -1; e_table_item_get_cell_geometry (item, - &row, + &row, &column, NULL, NULL, @@ -462,7 +462,7 @@ eti_get_row_extent_at (AtkTable *table, return -1; e_table_item_get_cell_geometry (item, - &row, + &row, &column, NULL, NULL, @@ -537,7 +537,7 @@ eti_get_summary (AtkTable *table) return NULL; } -static gboolean +static gboolean table_is_row_selected (AtkTable *table, gint row) { ETableItem *item; @@ -556,7 +556,7 @@ table_is_row_selected (AtkTable *table, gint row) return e_selection_model_is_row_selected(item->selection, view_to_model_row (item, row)); } -static gboolean +static gboolean table_is_selected (AtkTable *table, gint row, gint column) { return table_is_row_selected (table, row); @@ -591,7 +591,7 @@ table_get_selected_rows (AtkTable *table, gint **rows_selected) return n_selected; } -static gboolean +static gboolean table_add_row_selection (AtkTable *table, gint row) { ETableItem *item; @@ -608,7 +608,7 @@ table_add_row_selection (AtkTable *table, gint row) return TRUE; } -static gboolean +static gboolean table_remove_row_selection (AtkTable *table, gint row) { ETableItem *item; @@ -662,7 +662,7 @@ eti_atk_component_iface_init (AtkComponentIface *iface) } static void -eti_rows_inserted (ETableModel * model, int row, int count, +eti_rows_inserted (ETableModel * model, int row, int count, AtkObject * table_item) { gint n_cols,n_rows,i,j; @@ -676,11 +676,11 @@ eti_rows_inserted (ETableModel * model, int row, int count, n_rows = atk_table_get_n_rows (ATK_TABLE(table_item)); old_nrows = GET_PRIVATE(item_a11y)->rows; - + g_return_if_fail (n_cols > 0 && n_rows > 0); g_return_if_fail (old_nrows == n_rows - count); - GET_PRIVATE(table_item)->rows = n_rows; + GET_PRIVATE(table_item)->rows = n_rows; g_signal_emit_by_name (table_item, "row-inserted", row, count, NULL); @@ -697,12 +697,12 @@ 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, int row, int count, AtkObject * table_item) { gint i,j, n_rows, n_cols, old_nrows; ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item))); - + n_rows = atk_table_get_n_rows (ATK_TABLE(table_item)); n_cols = atk_table_get_n_columns (ATK_TABLE(table_item)); @@ -748,7 +748,7 @@ enum { ETI_HEADER_NEW_ADDED, ETI_HEADER_REMOVED, }; - + /* * 1. Check what actually happened: column reorder, remove or add * 2. Update cache @@ -757,17 +757,17 @@ enum { static void eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) { - + gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; GalA11yETableItem * a11y_item; ETableCol ** cols, **prev_cols; GalA11yETableItemPrivate *priv; gint *state = NULL, *prev_state = NULL, *reorder = NULL; gint i,j,n_rows,n_cols, prev_n_cols; - + a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); priv = GET_PRIVATE (a11y_item); - + /* Assume rows do not changed. */ n_rows = priv->rows; @@ -776,9 +776,9 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) cols = e_table_header_get_columns (eth); n_cols = eth->col_count; - + g_return_if_fail (cols && prev_cols && n_cols > 0); - + /* Init to ETI_HEADER_UNCHANGED. */ state = g_malloc0 (sizeof (gint) * n_cols); prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); @@ -799,7 +799,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) break; } } - + /* cols[i] is new added column. */ if ( j == prev_n_cols ) { added_found = TRUE; @@ -812,7 +812,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) for (j = 0 ; j < n_cols && cols[j]; j ++) if ( prev_cols [j] == cols[i] ) break; - + /* Removed columns found. */ if ( j == n_cols ) { removed_found = TRUE; @@ -861,7 +861,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) static void -eti_real_initialize (AtkObject *obj, +eti_real_initialize (AtkObject *obj, gpointer data) { ETableItem * eti; @@ -940,11 +940,11 @@ static void eti_a11y_cursor_changed_cb (ESelectionModel *selection, /** * gal_a11y_e_table_item_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableItem class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableItem class. **/ GType @@ -1029,7 +1029,7 @@ gal_a11y_e_table_item_new (ETableItem *item) GET_PRIVATE (a11y)->cols = item->cols; GET_PRIVATE (a11y)->rows = item->rows; - GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); + GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); if ( GET_PRIVATE (a11y)->columns == NULL) return NULL; @@ -1058,7 +1058,7 @@ gal_a11y_e_table_item_new (ETableItem *item) accessible->role = ATK_ROLE_TREE_TABLE; } else if (E_IS_TABLE (GET_PRIVATE (a11y)->widget)) { accessible->role = ATK_ROLE_TABLE; - } + } } if (item) @@ -1181,7 +1181,7 @@ eti_a11y_cursor_changed_cb (ESelectionModel *selection, g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y)); - if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT)) + if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT)) return; item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (a11y))); diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index 56cfdbd2f0..056b95775f 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -67,7 +67,7 @@ eti_get_accessible (ETableItem *eti, AtkObject *parent) return a11y; } -static gboolean +static gboolean init_child_item (GalA11yETable *a11y) { ETable *table; @@ -123,7 +123,7 @@ et_get_n_children (AtkObject *accessible) n = g_list_length (etgc->children); } } - + if (et && et->use_click_to_add && et->click_to_add) { n++; } @@ -212,11 +212,11 @@ et_init (GalA11yETable *a11y) /** * gal_a11y_e_table_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETable class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETable class. **/ GType @@ -282,7 +282,7 @@ gal_a11y_e_table_new (GObject *widget) return ATK_OBJECT (a11y); } -void +void gal_a11y_e_table_init (void) { if (atk_get_root ()) diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c index d5c7f80669..031220d46a 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.c +++ b/a11y/e-table/gal-a11y-e-tree-factory.c @@ -49,11 +49,11 @@ gal_a11y_e_tree_factory_init (GalA11yETreeFactory *factory) /** * gal_a11y_e_tree_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETreeFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETreeFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index 6ad507a4f3..72738ec011 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -106,11 +106,11 @@ et_init (GalA11yETree *a11y) /** * gal_a11y_e_tree_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETree class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETree class. **/ GType diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c index 732bc57af4..e124e6eb72 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.c +++ b/a11y/e-text/gal-a11y-e-text-factory.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -54,11 +54,11 @@ gal_a11y_e_text_factory_init (GalA11yETextFactory *factory) /** * gal_a11y_e_text_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETextFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETextFactory class. **/ GType diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index f1a06b73dc..91628572e2 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. @@ -71,7 +71,7 @@ et_get_extents (AtkComponent *component, if (width) *width = real_width; - if (height) + if (height) *height = real_height; } @@ -195,7 +195,7 @@ find_sentence_start (const char *text, char *at_offset; gunichar ch; int i; - + offset = find_word_start (text, begin_offset, step); len = g_utf8_strlen (text, -1); @@ -645,7 +645,7 @@ et_get_offset_at_point (AtkText *text, } -static gint +static gint et_get_n_selections (AtkText *text) { EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text))); @@ -742,7 +742,7 @@ et_remove_selection (AtkText *text, g_return_val_if_fail (E_IS_TEXT (obj), FALSE); etext = E_TEXT (obj); - if (selection_num == 0 + if (selection_num == 0 && etext->selection_start != etext->selection_end) { etext->selection_end = etext->selection_start; g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed"); @@ -786,7 +786,7 @@ et_set_caret_offset (AtkText *text, g_return_val_if_fail (E_IS_TEXT (obj), FALSE); etext = E_TEXT (obj); - + if (offset < -1) return FALSE; else { @@ -1021,7 +1021,7 @@ et_real_initialize (AtkObject *obj, if (etext->tep) g_signal_connect_after (etext->tep, "command", (GCallback) _et_command_cb, obj); - + obj->role = ATK_ROLE_TEXT; } @@ -1050,11 +1050,11 @@ et_init (GalA11yEText *a11y) /** * gal_a11y_e_text_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yEText class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yEText class. **/ GType diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index 3ce14976fe..eff20f7f45 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301, USA. * * Author: Bolian Yin Sun Microsystem Inc., 2003 diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h index 6cbfa99aaf..744af71173 100644 --- a/a11y/gal-a11y-factory.h +++ b/a11y/gal-a11y-factory.h @@ -22,7 +22,7 @@ * Authors: * Gilbert Fang , Sun Microsystem Inc. 2003. * - * This file is mainly from the gailfactory.h of GAIL. + * This file is mainly from the gailfactory.h of GAIL. */ #ifndef _GAL_A11Y_FACTORY_H__ diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c index 29a9dbc37d..0d35653445 100644 --- a/a11y/gal-a11y-util.c +++ b/a11y/gal-a11y-util.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey * * Copyright (C) 2002 Ximian, Inc. diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c index 0ec6f6ce8b..30a06ef426 100644 --- a/a11y/widgets/ea-calendar-cell.c +++ b/a11y/widgets/ea-calendar-cell.c @@ -180,7 +180,7 @@ ea_calendar_cell_init (EaCalendarCell *a11y) atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE); } -AtkObject* +AtkObject* ea_calendar_cell_new (GObject *obj) { gpointer object; @@ -298,12 +298,12 @@ ea_calendar_cell_ref_state_set (AtkObject *accessible) g_object_ref(atk_cell->state_set); return atk_cell->state_set; - + } /* Atk Component Interface */ -static void +static void atk_component_interface_init (AtkComponentIface *iface) { g_return_if_fail (iface != NULL); @@ -312,7 +312,7 @@ atk_component_interface_init (AtkComponentIface *iface) iface->grab_focus = component_interface_grab_focus; } -static void +static void component_interface_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) @@ -375,10 +375,10 @@ component_interface_grab_focus (AtkComponent *component) calitem = E_CALENDAR_ITEM (g_obj); index = atk_object_get_index_in_parent (ATK_OBJECT (a11y)); - + atk_selection_clear_selection (ATK_SELECTION (ea_calitem)); atk_selection_add_selection (ATK_SELECTION (ea_calitem), index); - + gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas)); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas)); if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel)) diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index 9def176376..585eba796d 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -57,7 +57,7 @@ static gint table_interface_get_column_at_index (AtkTable *table, static gint table_interface_get_row_at_index (AtkTable *table, gint index); static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column); static gint table_interface_get_n_rows (AtkTable *table); static gint table_interface_get_n_columns (AtkTable *table); @@ -128,7 +128,7 @@ static gboolean ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, static gboolean e_calendar_item_get_offset_for_date (ECalendarItem *calitem, gint year, gint month, gint day, gint *offset); -static void ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, +static void ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, AtkObject *item_cell); #ifdef ACC_DEBUG @@ -212,7 +212,7 @@ ea_calendar_item_class_init (EaCalendarItemClass *klass) class->ref_child = ea_calendar_item_ref_child; } -AtkObject* +AtkObject* ea_calendar_item_new (GObject *obj) { gpointer object; @@ -303,7 +303,7 @@ ea_calendar_item_get_name (AtkObject *accessible) day_end.tm_isdst = -1; e_utf8_strftime (buffer_end, sizeof (buffer_end), _("%d %B %Y"), &day_end); - name_str = g_strdup_printf (_("Calendar: from %s to %s"), buffer_start, buffer_end); + name_str = g_strdup_printf (_("Calendar: from %s to %s"), buffer_start, buffer_end); } #if 0 @@ -354,7 +354,7 @@ ea_calendar_item_ref_state_set (AtkObject *accessible) atk_state_set_add_state (state_set, ATK_STATE_ENABLED); atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); - + return state_set; } @@ -439,7 +439,7 @@ ea_calendar_item_ref_child (AtkObject *accessible, gint index) /* atk table interface */ -static void +static void atk_table_interface_init (AtkTableIface *iface) { g_return_if_fail (iface != NULL); @@ -472,9 +472,9 @@ atk_table_interface_init (AtkTableIface *iface) iface->get_column_description = table_interface_get_column_description; } -static AtkObject* +static AtkObject* table_interface_ref_at (AtkTable *table, - gint row, + gint row, gint column) { gint index; @@ -484,7 +484,7 @@ table_interface_ref_at (AtkTable *table, return ea_calendar_item_ref_child (ATK_OBJECT (ea_calitem), index); } -static gint +static gint table_interface_get_n_rows (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -501,7 +501,7 @@ table_interface_get_n_rows (AtkTable *table) return (n_children - 1) / EA_CALENDAR_COLUMN_NUM + 1; } -static gint +static gint table_interface_get_n_columns (AtkTable *table) { AtkGObjectAccessible *atk_gobj; @@ -592,7 +592,7 @@ table_interface_get_column_extent_at (AtkTable *table, return calitem->cell_width; } -static gint +static gint table_interface_get_row_extent_at (AtkTable *table, gint row, gint column) { @@ -611,7 +611,7 @@ table_interface_get_row_extent_at (AtkTable *table, } /* any day in the row is selected, the row is selected */ -static gboolean +static gboolean table_interface_is_row_selected (AtkTable *table, gint row) { @@ -661,9 +661,9 @@ table_interface_is_row_selected (AtkTable *table, return FALSE; } -static gboolean -table_interface_is_selected (AtkTable *table, - gint row, +static gboolean +table_interface_is_selected (AtkTable *table, + gint row, gint column) { AtkGObjectAccessible *atk_gobj; @@ -710,14 +710,14 @@ table_interface_is_selected (AtkTable *table, return FALSE; } -static gboolean +static gboolean table_interface_is_column_selected (AtkTable *table, gint column) { return FALSE; } -static gint +static gint table_interface_get_selected_rows (AtkTable *table, gint **rows_selected) { @@ -725,7 +725,7 @@ table_interface_get_selected_rows (AtkTable *table, return -1; } -static gint +static gint table_interface_get_selected_columns (AtkTable *table, gint **columns_selected) { @@ -733,45 +733,45 @@ table_interface_get_selected_columns (AtkTable *table, return -1; } -static gboolean -table_interface_add_row_selection (AtkTable *table, +static gboolean +table_interface_add_row_selection (AtkTable *table, gint row) { return FALSE; } -static gboolean -table_interface_remove_row_selection (AtkTable *table, +static gboolean +table_interface_remove_row_selection (AtkTable *table, gint row) { return FALSE; } -static gboolean -table_interface_add_column_selection (AtkTable *table, +static gboolean +table_interface_add_column_selection (AtkTable *table, gint column) { return FALSE; } -static gboolean -table_interface_remove_column_selection (AtkTable *table, +static gboolean +table_interface_remove_column_selection (AtkTable *table, gint column) { /* FIXME: NOT IMPLEMENTED */ return FALSE; } -static AtkObject* -table_interface_get_row_header (AtkTable *table, +static AtkObject* +table_interface_get_row_header (AtkTable *table, gint row) { /* FIXME: NOT IMPLEMENTED */ return NULL; } -static AtkObject* -table_interface_get_column_header (AtkTable *table, +static AtkObject* +table_interface_get_column_header (AtkTable *table, gint in_col) { /* FIXME: NOT IMPLEMENTED */ @@ -920,7 +920,7 @@ selection_interface_clear_selection (AtkSelection *selection) return TRUE; } -static AtkObject* +static AtkObject* selection_interface_ref_selection (AtkSelection *selection, gint i) { GObject *g_obj; diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c index aad60c3023..8a90700f41 100644 --- a/a11y/widgets/ea-combo-button.c +++ b/a11y/widgets/ea-combo-button.c @@ -16,7 +16,7 @@ static GType parent_type; /*Action IDs */ enum { ACTIVATE_DEFAULT, - POPUP_MENU, + POPUP_MENU, LAST_ACTION }; @@ -89,7 +89,7 @@ ea_combo_button_get_n_actions (AtkAction *action) static void atk_action_interface_init (AtkActionIface *iface) { - g_return_if_fail (iface != NULL); + g_return_if_fail (iface != NULL); iface->do_action = ea_combo_button_do_action; iface->get_n_actions = ea_combo_button_get_n_actions; diff --git a/a11y/widgets/ea-expander.c b/a11y/widgets/ea-expander.c index ebf0b67d1f..db174c37cb 100644 --- a/a11y/widgets/ea-expander.c +++ b/a11y/widgets/ea-expander.c @@ -134,7 +134,7 @@ ea_expander_get_type (void) (GInterfaceFinalizeFunc) NULL, NULL }; - + factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_BIN); parent_type = atk_object_factory_get_accessible_type (factory); g_type_query (parent_type, &query); -- cgit