diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/e-cal-model-tasks.c | 3 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index edfb5d8b3d..99c337905f 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -959,8 +959,7 @@ ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) break; } - return "black"; - /* return E_CAL_MODEL_CLASS (parent_class)->get_color_for_component (model, comp_data); */ + return E_CAL_MODEL_CLASS (parent_class)->get_color_for_component (model, comp_data); } static void diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index eff99818ad..72e3311a4f 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -321,7 +321,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, NULL); e_table_extras_add_cell (extras, "calstring", cell); @@ -334,7 +334,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, NULL); popup_cell = e_cell_date_edit_new (); @@ -357,7 +357,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, "editable", FALSE, NULL); @@ -379,7 +379,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, "editable", FALSE, NULL); @@ -402,7 +402,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, NULL); popup_cell = e_cell_combo_new (); @@ -431,7 +431,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, "editable", FALSE, NULL); @@ -452,7 +452,7 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_set (G_OBJECT (cell), "strikeout_column", E_CAL_MODEL_TASKS_FIELD_COMPLETE, "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE, - "color_column", E_CAL_MODEL_FIELD_COLOR, + "bg_color_column", E_CAL_MODEL_FIELD_COLOR, "editable", FALSE, NULL); |