Get the calendar's memopad and taskpad working.

What's interesting here is we're actually sharing the ECalModel across views.
Instead of having the Calendar view listen to GConf for changes to the Task
and Memo models, the Calendar view fetches the models directly from the Task
and Memo views -- starting the views if it has to, although the shell really
takes care of that -- and loads the models into its own taskpad and memopad.

We couldn't do that sort of thing before with Bonobo in the way.
Big chunks of redundant code should begin falling out shortly.

svn path=/branches/kill-bonobo/; revision=36696

1 files changed, 1 insertions, 1 deletions

diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 095cfabc4b..e4d7304c25 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -1108,7 +1108,7 @@ ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 /**
  * e_cal_model_tasks_new
  */
-ECalModelTasks *
+ECalModel *
 e_cal_model_tasks_new (void)
 {
 	return g_object_new (E_TYPE_CAL_MODEL_TASKS, NULL);