diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2006-01-27 22:50:40 +0800 |
---|---|---|
committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2006-01-27 22:50:40 +0800 |
commit | 08d6eeabaa3402e349a2d88b1e344b5fc04815bc (patch) | |
tree | 7e50ef67042d5a5c9d0c61e566e4c88b301a8ef8 | |
parent | 89c42a519884edd815dff38dd8530b7403f350d1 (diff) | |
download | gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar.gz gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar.bz2 gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar.lz gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar.xz gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.tar.zst gsoc2013-evolution-08d6eeabaa3402e349a2d88b1e344b5fc04815bc.zip |
reviewed by: Harish Krishnaswamy <kharish@novell.com>
2006-01-27 Kjartan Maraas <kmaraas@gnome.org>
reviewed by: Harish Krishnaswamy <kharish@novell.com>
* addressbook/ea-addressbook.c: Remove extra semi-colons.
* calendar/ea-cal-view.c: (ea_cal_view_event_changed_cb),
(ea_cal_view_event_added_cb), (action_interface_get_keybinding):
Remove unused code and variables.
* calendar/ea-day-view-main-item.c:
(table_interface_get_row_description): More removal of unused bits
* calendar/ea-week-view-main-item.c:
(ea_week_view_main_item_get_row_at_index),
(ea_week_view_main_item_get_column_at_index),
(ea_week_view_main_item_get_row_label),
(table_interface_get_n_columns),
(table_interface_get_column_description): Same again.
* e-table/gal-a11y-e-table-item.c: (gal_a11y_e_table_item_new):
And again.
* e-table/gal-a11y-e-table.c: (et_ref_child): Remove unused var.
* e-table/gal-a11y-e-tree.c: (gal_a11y_e_tree_new): Again.
* e-text/gal-a11y-e-text.c: (et_set_selection),
(et_real_initialize): Same here too.
* widgets/ea-calendar-item.c:
(table_interface_get_column_description),
(table_interface_get_row_description),
(selection_interface_is_child_selected),
(ea_calendar_item_get_cell_data): And here too.
* widgets/ea-widgets.c: More redundant semi-colons.
svn path=/trunk/; revision=31324
-rw-r--r-- | a11y/ChangeLog | 29 | ||||
-rw-r--r-- | a11y/addressbook/ea-addressbook.c | 6 | ||||
-rw-r--r-- | a11y/calendar/ea-cal-view.c | 12 | ||||
-rw-r--r-- | a11y/calendar/ea-day-view-main-item.c | 5 | ||||
-rw-r--r-- | a11y/calendar/ea-week-view-main-item.c | 25 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-item.c | 2 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table.c | 1 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-tree.c | 3 | ||||
-rw-r--r-- | a11y/e-text/gal-a11y-e-text.c | 4 | ||||
-rw-r--r-- | a11y/widgets/ea-calendar-item.c | 9 | ||||
-rw-r--r-- | a11y/widgets/ea-widgets.c | 4 |
11 files changed, 34 insertions, 66 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 6aa9bfaf24..5ddaffd47d 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,32 @@ +2006-01-27 Kjartan Maraas <kmaraas@gnome.org> + + reviewed by: Harish Krishnaswamy <kharish@novell.com> + + * addressbook/ea-addressbook.c: Remove extra semi-colons. + * calendar/ea-cal-view.c: (ea_cal_view_event_changed_cb), + (ea_cal_view_event_added_cb), (action_interface_get_keybinding): + Remove unused code and variables. + * calendar/ea-day-view-main-item.c: + (table_interface_get_row_description): More removal of unused bits + * calendar/ea-week-view-main-item.c: + (ea_week_view_main_item_get_row_at_index), + (ea_week_view_main_item_get_column_at_index), + (ea_week_view_main_item_get_row_label), + (table_interface_get_n_columns), + (table_interface_get_column_description): Same again. + * e-table/gal-a11y-e-table-item.c: (gal_a11y_e_table_item_new): + And again. + * e-table/gal-a11y-e-table.c: (et_ref_child): Remove unused var. + * e-table/gal-a11y-e-tree.c: (gal_a11y_e_tree_new): Again. + * e-text/gal-a11y-e-text.c: (et_set_selection), + (et_real_initialize): Same here too. + * widgets/ea-calendar-item.c: + (table_interface_get_column_description), + (table_interface_get_row_description), + (selection_interface_is_child_selected), + (ea_calendar_item_get_cell_data): And here too. + * widgets/ea-widgets.c: More redundant semi-colons. + 2006-01-10 Simon Zheng <simon.zheng@sun.com> * widgets/ea-calendar-item.c: use e_utf8_strftime() in diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index 51ae26ba97..f4a5ebfae1 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -30,9 +30,9 @@ #include "ea-minicard-view.h" #include "ea-addressbook-view.h" -EA_FACTORY_GOBJECT (EA_TYPE_MINICARD, ea_minicard, ea_minicard_new); -EA_FACTORY_GOBJECT (EA_TYPE_MINICARD_VIEW, ea_minicard_view, ea_minicard_view_new); -EA_FACTORY_GOBJECT (EA_TYPE_AB_VIEW, ea_ab_view, ea_ab_view_new); +EA_FACTORY_GOBJECT (EA_TYPE_MINICARD, ea_minicard, ea_minicard_new) +EA_FACTORY_GOBJECT (EA_TYPE_MINICARD_VIEW, ea_minicard_view, ea_minicard_view_new) +EA_FACTORY_GOBJECT (EA_TYPE_AB_VIEW, ea_ab_view, ea_ab_view_new) static gboolean ea_addressbook_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index 31400ca2da..6a25455410 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -191,7 +191,6 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event gpointer data) { AtkObject *atk_obj; - EaCalView *ea_cal_view; AtkObject *event_atk_obj = NULL; g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); @@ -199,7 +198,6 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view)); if (!EA_IS_CAL_VIEW (atk_obj)) return; - ea_cal_view = EA_CAL_VIEW (atk_obj); if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) { event_atk_obj = @@ -230,7 +228,6 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event, gpointer data) { AtkObject *atk_obj; - EaCalView *ea_cal_view; AtkObject *event_atk_obj = NULL; gint index; @@ -239,7 +236,6 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event, atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view)); if (!EA_IS_CAL_VIEW (atk_obj)) return; - ea_cal_view = EA_CAL_VIEW (atk_obj); if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) { event_atk_obj = @@ -391,7 +387,6 @@ static G_CONST_RETURN gchar* action_interface_get_keybinding (AtkAction *action, gint index) { GtkWidget *widget; - EaCalView *ea_cal_view; widget = GTK_ACCESSIBLE (action)->widget; if (widget == NULL) @@ -403,29 +398,22 @@ action_interface_get_keybinding (AtkAction *action, gint index) if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget)) return FALSE; - ea_cal_view = EA_CAL_VIEW (action); - switch (index) { case 0: /* New Appointment */ return "<Alt>fna;<Control>n"; - break; case 1: /* New Event */ return "<Alt>fnd;<Shift><Control>d"; - break; case 2: /* New Meeting */ return "<Alt>fne;<Shift><Control>e"; - break; case 3: /* Go to today */ return "<Alt>vt;<Alt><Control>t"; - break; case 4: /* Go to date */ return "<Alt>vd;<Alt><Control>g"; - break; default: break; } diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index ea8b9ce2ee..4912e6ee7a 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -1085,8 +1085,6 @@ table_interface_get_row_description (AtkTable *table, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EDayViewMainItem *main_item; - EDayView *day_view; EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table); const gchar *description; EaCellTable *cell_data; @@ -1096,9 +1094,6 @@ table_interface_get_row_description (AtkTable *table, if (!g_obj) return NULL; - main_item = E_DAY_VIEW_MAIN_ITEM (g_obj); - day_view = main_item->day_view; - if (row < 0 || row >= 12 * 24) return NULL; cell_data = ea_day_view_main_item_get_cell_data (ea_main_item); diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 81a66cfedc..490c235446 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -491,8 +491,6 @@ ea_week_view_main_item_get_row_at_index (EaWeekViewMainItem *ea_main_item, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EWeekViewMainItem *main_item; - EWeekView *week_view; gint n_children; g_return_val_if_fail (ea_main_item, -1); @@ -502,9 +500,6 @@ ea_week_view_main_item_get_row_at_index (EaWeekViewMainItem *ea_main_item, if (!g_obj) return -1; - main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); - week_view = main_item->week_view; - n_children = ea_week_view_main_item_get_n_children (ATK_OBJECT (ea_main_item)); if (index >= 0 && index < n_children) return index / 7; @@ -517,8 +512,6 @@ ea_week_view_main_item_get_column_at_index (EaWeekViewMainItem *ea_main_item, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EWeekViewMainItem *main_item; - EWeekView *week_view; gint n_children; g_return_val_if_fail (ea_main_item, -1); @@ -528,9 +521,6 @@ ea_week_view_main_item_get_column_at_index (EaWeekViewMainItem *ea_main_item, if (!g_obj) return -1; - main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); - week_view = main_item->week_view; - n_children = ea_week_view_main_item_get_n_children (ATK_OBJECT (ea_main_item)); if (index >= 0 && index < n_children) return index % 7; @@ -543,8 +533,6 @@ ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EWeekViewMainItem *main_item; - EWeekView *week_view; g_return_val_if_fail (ea_main_item, 0); @@ -553,9 +541,6 @@ ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item, if (!g_obj) return 0 ; - main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); - week_view = main_item->week_view; - return g_snprintf (buffer, buffer_size, "the %i week", row + 1); @@ -715,8 +700,6 @@ table_interface_get_n_columns (AtkTable *table) { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EWeekViewMainItem *main_item; - EWeekView *week_view; EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table); atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item); @@ -724,9 +707,6 @@ table_interface_get_n_columns (AtkTable *table) if (!g_obj) return -1; - main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); - week_view = main_item->week_view; - return 7; } @@ -1037,8 +1017,6 @@ table_interface_get_column_description (AtkTable *table, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - EWeekViewMainItem *main_item; - EWeekView *week_view; EaWeekViewMainItem* ea_main_item = EA_WEEK_VIEW_MAIN_ITEM (table); const gchar *description; EaCellTable *cell_data; @@ -1048,9 +1026,6 @@ table_interface_get_column_description (AtkTable *table, if (!g_obj) return NULL; - main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj); - week_view = main_item->week_view; - if (in_col < 0 || in_col > 6) return NULL; cell_data = ea_week_view_main_item_get_cell_data (ea_main_item); diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 2f2d72d4eb..35eae0cf54 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -1002,7 +1002,6 @@ gal_a11y_e_table_item_new (ETableItem *item) { GalA11yETableItem *a11y; AtkObject *accessible; - int n; ESelectionModel * esm; AtkObject *parent; const char *name; @@ -1024,7 +1023,6 @@ gal_a11y_e_table_item_new (ETableItem *item) accessible = ATK_OBJECT(a11y); /* Initialize cell data. */ - n = item->cols * item->rows; GET_PRIVATE (a11y)->cols = item->cols; GET_PRIVATE (a11y)->rows = item->rows; diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index de4a58a50b..56cfdbd2f0 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -162,7 +162,6 @@ et_ref_child (AtkObject *accessible, } } } else if (i == child_no -1) { - AtkObject * accessible; ETableClickToAdd * etcta; if (et && et->use_click_to_add && et->click_to_add) { diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index f175f78564..6ad507a4f3 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -155,9 +155,6 @@ AtkObject * gal_a11y_e_tree_new (GObject *widget) { GalA11yETree *a11y; - ETree *tree; - - tree = E_TREE (widget); a11y = g_object_new (gal_a11y_e_tree_get_type (), NULL); diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index d23deef07d..1fd0a63476 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -766,14 +766,12 @@ et_set_selection (AtkText *text, gint end_offset) { GObject *obj; - EText *etext; g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE); obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); if (obj == NULL) return FALSE; g_return_val_if_fail (E_IS_TEXT (obj), FALSE); - etext = E_TEXT (obj); if (selection_num == 0) return et_add_selection (text, start_offset, end_offset); return FALSE; @@ -1015,7 +1013,6 @@ static void et_real_initialize (AtkObject *obj, gpointer data) { - GalA11yEText *a11y; EText *etext; ATK_OBJECT_CLASS (parent_class)->initialize (obj, data); @@ -1023,7 +1020,6 @@ et_real_initialize (AtkObject *obj, g_return_if_fail (GAL_A11Y_IS_E_TEXT (obj)); g_return_if_fail (E_IS_TEXT (data)); - a11y = GAL_A11Y_E_TEXT (obj); etext = E_TEXT (data); /* Set up signal callbacks */ diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index b8e283e604..0aeac944df 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -786,7 +786,6 @@ table_interface_get_column_description (AtkTable *table, gint in_col) { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - ECalendarItem *calitem; EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table); const gchar *description = NULL; EaCellTable *cell_data; @@ -797,7 +796,6 @@ table_interface_get_column_description (AtkTable *table, gint in_col) if (!g_obj) return NULL; - calitem = E_CALENDAR_ITEM (g_obj); n_columns = table_interface_get_n_columns (table); if (in_col < 0 || in_col >= n_columns) return NULL; @@ -822,7 +820,6 @@ table_interface_get_row_description (AtkTable *table, gint row) { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - ECalendarItem *calitem; EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table); const gchar *description = NULL; EaCellTable *cell_data; @@ -833,7 +830,6 @@ table_interface_get_row_description (AtkTable *table, gint row) if (!g_obj) return NULL; - calitem = E_CALENDAR_ITEM (g_obj); n_rows = table_interface_get_n_rows (table); if (row < 0 || row >= n_rows) return NULL; @@ -972,7 +968,6 @@ selection_interface_is_child_selected (AtkSelection *selection, gint index) { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - ECalendarItem *calitem; EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection); gint row, column, n_children; @@ -981,7 +976,6 @@ selection_interface_is_child_selected (AtkSelection *selection, gint index) if (!g_obj) return FALSE; - calitem = E_CALENDAR_ITEM (g_obj); n_children = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); if (index < 0 || index >= n_children) return FALSE; @@ -1042,7 +1036,6 @@ ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem) { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - ECalendarItem *calitem; EaCellTable *cell_data; g_return_val_if_fail (ea_calitem, NULL); @@ -1052,8 +1045,6 @@ ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem) if (!g_obj) return NULL; - calitem = E_CALENDAR_ITEM (g_obj); - cell_data = g_object_get_data (G_OBJECT(ea_calitem), "ea-calendar-cell-table"); diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c index feef6d1ef3..372783b92d 100644 --- a/a11y/widgets/ea-widgets.c +++ b/a11y/widgets/ea-widgets.c @@ -28,8 +28,8 @@ #include "widgets/ea-combo-button.h" #include "ea-widgets.h" -EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new); -EA_FACTORY (EA_TYPE_COMBO_BUTTON, ea_combo_button, ea_combo_button_new); +EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new) +EA_FACTORY (EA_TYPE_COMBO_BUTTON, ea_combo_button, ea_combo_button_new) void e_calendar_item_a11y_init (void) { |