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, 15 insertions, 14 deletions

diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index e7b4830b94..81be15df44 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -441,6 +441,16 @@ primary_source_selection_changed_cb (ESourceSelector *selector, CalendarComponen
 }
 
 static void
+source_removed_cb (GnomeCalendar *calendar, ECalSourceType source_type, ESource *source, CalendarComponentView *component_view)
+{
+	switch (source_type) {
+	case E_CAL_SOURCE_TYPE_EVENT:
+		e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
+	default:
+	}
+}
+
+static void
 config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	CalendarComponent *calendar_component = data;
@@ -960,14 +970,19 @@ create_component_view (CalendarComponent *calendar_component)
 	}
 
 	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
+	g_signal_connect (component_view->calendar, "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);
 	
+	gnome_calendar_set_activity_handler (component_view->calendar, 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",
@@ -1300,20 +1315,6 @@ calendar_component_peek_source_list (CalendarComponent *component)
 	return component->priv->source_list;
 }
 
-ESourceSelector *
-calendar_component_peek_source_selector (CalendarComponent *component)
-{
-// return E_SOURCE_SELECTOR (component->priv->source_selector);
-	return NULL;
-}
-
-EActivityHandler *
-calendar_component_peek_activity_handler (CalendarComponent *component)
-{
-//	return component->priv->activity_handler;
-	return NULL;
-}
-
 void
 calendar_component_init_publishing (void)
 {