From 87e60de4aae77bc239ceb67aaa2c7c8bd6a24343 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 29 Apr 2004 19:36:53 +0000 Subject: remove prototypes 2004-04-29 JP Rosevear * gui/tasks-component.h (tasks_component_peek_source_list): remove prototypes * gui/tasks-component.c (source_removed_cb): unselect the source in the selector if source removed from calendar (create_component_view): create the activity handler and listen to source remove signal * gui/gnome-cal.h: add signals, protos * gui/gnome-cal.c (gnome_calendar_class_init): add source added and removed signals (client_cal_opened_cb): emit source removed signal (open_ecal): set the status message (backend_died_cb): emit source removed signal (gnome_calendar_set_activity_handler): allow an activity handler to be set (gnome_calendar_add_source): emit source added signal (gnome_calendar_remove_source): emit source removed signal (display_view): update the active activity handler * gui/e-tasks.h: add signal prototypes * gui/e-tasks.c (e_tasks_class_init): add source added and removed signals (backend_died_cb): emit source removed signal (e_tasks_add_todo_source): emit source added/removed signals (e_tasks_remove_todo_source): emit source removed signal * gui/e-calendar-view.h: add proto * gui/e-calendar-view.c (e_calendar_view_set_activity_handler): allow an activity handler to be set (e_calendar_view_set_status_message): use private activity handler (if any) to set status message * gui/e-calendar-table.h: add data member and proto * gui/e-calendar-table.c (e_calendar_table_set_activity_handler): allow an activity handler to be set (e_calendar_table_set_status_message): use private activity handler (if any) to set status message * gui/e-calendar-marshal.list: add extra marshallers * gui/calendar-component.h: kill protos * gui/calendar-component.c (source_removed_cb): unselect the source in the selector if source removed from calendar (create_component_view): create the activity handler and listen to source remove signal svn path=/trunk/; revision=25694 --- calendar/gui/e-calendar-table.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'calendar/gui/e-calendar-table.c') diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index d224b21d12..9da8ae43c0 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1360,16 +1360,24 @@ static char *test[] = { static GdkPixbuf *progress_icon = NULL; void -e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message) +e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandler *activity_handler) { -#if 0 - EActivityHandler *activity_handler = tasks_component_peek_activity_handler (tasks_component_peek ()); + g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table)); + cal_table->activity_handler = activity_handler; +} + +void +e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message) +{ g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table)); + if (!cal_table->activity_handler) + return; + if (!message || !*message) { if (cal_table->activity_id != 0) { - e_activity_handler_operation_finished (activity_handler, cal_table->activity_id); + e_activity_handler_operation_finished (cal_table->activity_handler, cal_table->activity_id); cal_table->activity_id = 0; } } else if (cal_table->activity_id == 0) { @@ -1378,12 +1386,11 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes if (progress_icon == NULL) progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, 16); - cal_table->activity_id = e_activity_handler_operation_started (activity_handler, client_id, + cal_table->activity_id = e_activity_handler_operation_started (cal_table->activity_handler, client_id, progress_icon, message, TRUE); g_free (client_id); } else { - e_activity_handler_operation_progressing (activity_handler, cal_table->activity_id, message, -1.0); + e_activity_handler_operation_progressing (cal_table->activity_handler, cal_table->activity_id, message, -1.0); } -#endif } -- cgit v1.2.3