1 files changed, 38 insertions, 198 deletions

diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 23bd46f34f..7510ef897f 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -26,7 +26,7 @@
 #include <gnome.h>
 #include <gal/util/e-util.h>
 #include <gal/e-table/e-table-scrolled.h>
-#include <gal/menus/gal-view-instance.h>
+#include <gal/menus/gal-view-collection.h>
 #include <gal/menus/gal-view-factory-etable.h>
 #include <gal/menus/gal-view-etable.h>
 #include "e-util/e-url.h"
@@ -47,16 +47,15 @@ static GList *all_tasks = NULL;
 struct _ETasksPrivate {
 	/* The calendar client object we monitor */
 	CalClient   *client;
-	CalQuery    *query;
-	
+
 	/* The ECalendarTable showing the tasks. */
 	GtkWidget   *tasks_view;
 
 	/* Calendar search bar for tasks */
 	GtkWidget *search_bar;
 
-	/* View instance and the view menus handler */
-	GalViewInstance *view_instance;
+	/* View collection and the view menus handler */
+	GalViewCollection *view_collection;
 	GalViewMenus *view_menus;
 };
 
@@ -121,10 +120,10 @@ e_tasks_init (ETasks *tasks)
 	priv = g_new0 (ETasksPrivate, 1);
 	tasks->priv = priv;
 
-	priv->client = NULL;
-	priv->query = NULL;
-	priv->view_instance = NULL;
+	priv->view_collection = NULL;
 	priv->view_menus = NULL;
+
+	setup_widgets (tasks);
 }
 
 /* Callback used when the selection changes in the table. */
@@ -242,8 +241,6 @@ e_tasks_construct (ETasks *tasks)
 
 	priv = tasks->priv;
 
-	setup_widgets (tasks);
-
 	priv->client = cal_client_new ();
 	if (!priv->client)
 		return NULL;
@@ -281,17 +278,6 @@ e_tasks_new (void)
 }
 
 
-void
-e_tasks_set_ui_component (ETasks *tasks,
-			  BonoboUIComponent *ui_component)
-{
-	g_return_if_fail (E_IS_TASKS (tasks));
-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
-
-	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
-}
-
-
 static void
 e_tasks_destroy (GtkObject *object)
 {
@@ -325,17 +311,6 @@ e_tasks_destroy (GtkObject *object)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
-static void
-set_status_message (ETasks *tasks, const char *message)
-{
-	ETasksPrivate *priv;
-	CalendarModel *model;
-	
-	priv = tasks->priv;
-	
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-	calendar_model_set_status_message (model, message);
-}
 
 gboolean
 e_tasks_open			(ETasks		*tasks,
@@ -360,7 +335,9 @@ e_tasks_open			(ETasks		*tasks,
 		real_uri = g_strdup (file);
 
 	message = g_strdup_printf (_("Opening tasks at %s"), real_uri);
-	set_status_message (tasks, message);
+	calendar_model_set_status_message (
+		e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)),
+		message);
 	g_free (message);
 
 	if (!cal_client_open_calendar (priv->client, real_uri, FALSE)) {
@@ -420,7 +397,8 @@ cal_opened_cb				(CalClient	*client,
 	tasks = E_TASKS (data);
 	priv = tasks->priv;
 
-	set_status_message (tasks, NULL);
+	calendar_model_set_status_message (
+		e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view)), NULL);
 
 	switch (status) {
 	case CAL_CLIENT_OPEN_SUCCESS:
@@ -522,30 +500,6 @@ e_tasks_new_task			(ETasks		*tasks)
 }
 
 /**
- * e_tasks_complete_selected:
- * @tasks: A tasks control widget
- * 
- * Marks the selected tasks complete
- **/
-void
-e_tasks_complete_selected (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	ECalendarTable *cal_table;
-
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-
-	set_status_message (tasks, _("Completing tasks..."));
-	e_calendar_table_complete_selected (cal_table);
-	set_status_message (tasks, NULL);
-}
-
-/**
  * e_tasks_delete_selected:
  * @tasks: A tasks control widget.
  * 
@@ -563,120 +517,12 @@ e_tasks_delete_selected (ETasks *tasks)
 	priv = tasks->priv;
 
 	cal_table = E_CALENDAR_TABLE (priv->tasks_view);
-	set_status_message (tasks, _("Deleting selected objects..."));
 	e_calendar_table_delete_selected (cal_table);
-	set_status_message (tasks, NULL);
-}
-
-static char *
-create_sexp (void)
-{
-	char *sexp;
-
-	sexp = g_strdup ("(and (= (get-vtype) \"VTODO\") (is-completed?))");
-#if 0
-	g_print ("Calendar model sexp:\n%s\n", sexp);
-#endif
-
-	return sexp;
-}
-
-/* Callback used when a component is updated in the live query */
-static void
-query_obj_updated_cb (CalQuery *query, const char *uid,
-		      gboolean query_in_progress, int n_scanned, int total,
-		      gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	cal_client_remove_object (priv->client, uid);
-}
-
-/* Callback used when an evaluation error occurs when running a query */
-static void
-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	g_warning ("eval error: %s\n", error_str);
-
-	set_status_message (tasks, NULL);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->query), tasks);
-	gtk_object_unref (GTK_OBJECT (priv->query));
-	priv->query = NULL;
-}
-
-static void
-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)
-{
-	ETasks *tasks;
-	ETasksPrivate *priv;
-	
-	tasks = E_TASKS (data);
-	priv = tasks->priv;
-	
-	if (status != CAL_QUERY_DONE_SUCCESS)
-		g_warning ("query done: %s\n", error_str);
-
-	set_status_message (tasks, NULL);
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->query), tasks);
-	gtk_object_unref (GTK_OBJECT (priv->query));
-	priv->query = NULL;
-}
-/**
- * e_tasks_expunge:
- * @tasks: A tasks control widget
- * 
- * Removes all tasks marked as completed
- **/
-void
-e_tasks_delete_completed (ETasks *tasks)
-{
-	ETasksPrivate *priv;
-	char *sexp;
-	
-	g_return_if_fail (tasks != NULL);
-	g_return_if_fail (E_IS_TASKS (tasks));
-
-	priv = tasks->priv;
-
-	/* If we have a query, we are already expunging */
-	if (priv->query)
-		return;
-
-	sexp = create_sexp ();
-
-	set_status_message (tasks, _("Expunging"));
-	priv->query = cal_client_get_query (priv->client, sexp);
-	g_free (sexp);
-
-	if (!priv->query) {
-		set_status_message (tasks, NULL);
-		g_message ("update_query(): Could not create the query");
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->query), "obj_updated",
-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "query_done",
-			    GTK_SIGNAL_FUNC (query_query_done_cb), tasks);
-	gtk_signal_connect (GTK_OBJECT (priv->query), "eval_error",
-			    GTK_SIGNAL_FUNC (query_eval_error_cb), tasks);
 }
 
 /* Callback used from the view collection when we need to display a new view */
 static void
-display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)
+display_view_cb (GalViewCollection *collection, GalView *view, gpointer data)
 {
 	ETasks *tasks;
 
@@ -704,7 +550,6 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 	GalViewFactory *factory;
 	ETableSpecification *spec;
 	char *dir;
-	static GalViewCollection *collection = NULL;
 
 	g_return_if_fail (tasks != NULL);
 	g_return_if_fail (E_IS_TASKS (tasks));
@@ -713,45 +558,40 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)
 
 	priv = tasks->priv;
 
-	g_return_if_fail (priv->view_instance == NULL);
+	g_return_if_fail (priv->view_collection == NULL);
 
-	g_assert (priv->view_instance == NULL);
+	g_assert (priv->view_collection == NULL);
 	g_assert (priv->view_menus == NULL);
 
-	/* Create the view instance */
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new ();
+	/* Create the view collection */
 
-		dir = gnome_util_prepend_user_home ("/evolution/views/tasks/");
-		gal_view_collection_set_storage_directories (collection,
-							     EVOLUTION_DATADIR "/evolution/views/tasks/",
-							     dir);
-		g_free (dir);
+	priv->view_collection = gal_view_collection_new ();
 
-		/* Create the views */
+	dir = gnome_util_prepend_user_home ("/evolution/views/tasks/");
+	gal_view_collection_set_storage_directories (priv->view_collection,
+						     EVOLUTION_DATADIR "/evolution/views/tasks/",
+						     dir);
+	g_free (dir);
 
-		spec = e_table_specification_new ();
-		e_table_specification_load_from_file (spec, 
-						      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");
+	/* Create the views */
 
-		factory = gal_view_factory_etable_new (spec);
-		gtk_object_unref (GTK_OBJECT (spec));
-		gal_view_collection_add_factory (collection, factory);
-		gtk_object_unref (GTK_OBJECT (factory));
+	spec = e_table_specification_new ();
+	e_table_specification_load_from_file (spec, 
+					      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");
 
-		/* Load the collection and create the menus */
+	factory = gal_view_factory_etable_new (spec);
+	gtk_object_unref (GTK_OBJECT (spec));
+	gal_view_collection_add_factory (priv->view_collection, factory);
+	gtk_object_unref (GTK_OBJECT (factory));
 
-		gal_view_collection_load (collection);
-	}
+	/* Load the collection and create the menus */
 
-	priv->view_instance = gal_view_instance_new (collection, cal_client_get_uri (priv->client));
+	gal_view_collection_load (priv->view_collection);
 
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
+	priv->view_menus = gal_view_menus_new (priv->view_collection);
 	gal_view_menus_apply (priv->view_menus, uic, NULL);
-	gtk_signal_connect (GTK_OBJECT (priv->view_instance), "display_view",
+	gtk_signal_connect (GTK_OBJECT (priv->view_collection), "display_view",
 			    GTK_SIGNAL_FUNC (display_view_cb), tasks);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), tasks);
 }
 
 /**
@@ -772,13 +612,13 @@ e_tasks_discard_view_menus (ETasks *tasks)
 
 	priv = tasks->priv;
 
-	g_return_if_fail (priv->view_instance != NULL);
+	g_return_if_fail (priv->view_collection != NULL);
 
-	g_assert (priv->view_instance != NULL);
+	g_assert (priv->view_collection != NULL);
 	g_assert (priv->view_menus != NULL);
 
-	gtk_object_unref (GTK_OBJECT (priv->view_instance));
-	priv->view_instance = NULL;
+	gtk_object_unref (GTK_OBJECT (priv->view_collection));
+	priv->view_collection = NULL;
 
 	gtk_object_unref (GTK_OBJECT (priv->view_menus));
 	priv->view_menus = NULL;