remove prototypes

2004-04-29  JP Rosevear  <jpr@ximian.com>

	* 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

1 files changed, 10 insertions, 14 deletions

diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index e94a5d0cf8..c92bbe7a36 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -376,6 +376,11 @@ primary_source_selection_changed_cb (ESourceSelector *selector, TasksComponentVi
 	update_uri_for_primary_selection (component_view);
 }
 
+static void
+source_removed_cb (ETasks *tasks, ESource *source, TasksComponentView *component_view)
+{
+	e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
+}
 
 /* Evolution::Component CORBA methods */
 
@@ -602,14 +607,19 @@ create_component_view (TasksComponent *tasks_component)
 	}
 
 	component_view->tasks = (ETasks *) bonobo_control_get_widget (component_view->view_control);
+	g_signal_connect (component_view->tasks, "source_removed", 
+			  G_CALLBACK (source_removed_cb), component_view);
 
 	/* Create status bar */
 	statusbar_widget = e_task_bar_new ();
+	component_view->activity_handler = e_activity_handler_new ();
 	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
 	gtk_widget_show (statusbar_widget);
 
 	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
 	
+	e_calendar_table_set_activity_handler (e_tasks_get_calendar_table (component_view->tasks), component_view->activity_handler);
+	
 	/* connect after setting the initial selections, or we'll get unwanted calls
 	   to calendar_control_sensitize_calendar_commands */
 	g_signal_connect (component_view->source_selector, "selection_changed",
@@ -891,18 +901,4 @@ tasks_component_peek_source_list (TasksComponent *component)
 	return component->priv->source_list;	
 }
 
-ESourceSelector *
-tasks_component_peek_source_selector (TasksComponent *component)
-{
-//	return component->priv->source_selector;
-	return NULL;
-}
-
-EActivityHandler *
-tasks_component_peek_activity_handler (TasksComponent *component)
-{
-//	return component->priv->activity_handler;
-	return NULL;
-}
-
 BONOBO_TYPE_FUNC_FULL (TasksComponent, GNOME_Evolution_Component, PARENT_TYPE, tasks_component)