1 files changed, 6 insertions, 38 deletions

diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 379bbfec95..245b8bfd04 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -24,7 +24,6 @@
 #include "e-week-view.h"
 #include "event-editor.h"
 #include "gnome-cal.h"
-#include "component-factory.h"
 #include "calendar-commands.h"
 #include "calendar-config.h"
 
@@ -198,7 +197,6 @@ setup_widgets (GnomeCalendar *gcal)
 {
 	GnomeCalendarPrivate *priv;
 	GtkWidget *w;
-	gchar *filename;
 
 	priv = gcal->priv;
 
@@ -247,10 +245,6 @@ setup_widgets (GnomeCalendar *gcal)
 	e_paned_pack2 (E_PANED (priv->vpane), priv->todo, TRUE, TRUE);
 	gtk_widget_show (priv->todo);
 
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
 	/* The Day View. */
 	priv->day_view = e_day_view_new ();
 	e_day_view_set_calendar (E_DAY_VIEW (priv->day_view), gcal);
@@ -343,7 +337,6 @@ gnome_calendar_destroy (GtkObject *object)
 {
 	GnomeCalendar *gcal;
 	GnomeCalendarPrivate *priv;
-	gchar *filename;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (GNOME_IS_CALENDAR (object));
@@ -351,11 +344,6 @@ gnome_calendar_destroy (GtkObject *object)
 	gcal = GNOME_CALENDAR (object);
 	priv = gcal->priv;
 
-	/* Save the TaskPad layout. */
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
 	priv->load_state = LOAD_STATE_NOT_LOADED;
 
 	if (priv->loading_uri) {
@@ -616,8 +604,6 @@ gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
 	priv->current_view_type = view;
 	priv->range_selected = range_selected;
 
-	calendar_config_set_default_view (view);
-
 	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), view);
 
 	if (focus)
@@ -1057,11 +1043,11 @@ load_alarms (GnomeCalendar *gcal)
 
 	/* Queue the midnight alarm refresh */
 
-	priv->midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL);
-	if (!priv->midnight_alarm_refresh_id) {
-		g_message ("load_alarms(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
+/*  	priv->midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL); */
+/*  	if (!priv->midnight_alarm_refresh_id) { */
+/*  		g_message ("load_alarms(): Could not set up the midnight refresh alarm!"); */
+  		/* FIXME: what to do? */
+/*  	} */
 }
 
 /* Loads the initial data into the calendar; this should be called right after
@@ -1294,8 +1280,6 @@ GtkWidget *
 gnome_calendar_construct (GnomeCalendar *gcal)
 {
 	GnomeCalendarPrivate *priv;
-	gint view;
-	gchar *page;
 
 	g_return_val_if_fail (gcal != NULL, NULL);
 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
@@ -1320,23 +1304,7 @@ gnome_calendar_construct (GnomeCalendar *gcal)
 	e_week_view_set_cal_client (E_WEEK_VIEW (priv->week_view), priv->client);
 	e_week_view_set_cal_client (E_WEEK_VIEW (priv->month_view), priv->client);
 
-	view = calendar_config_get_default_view ();
-	switch (view) {
-	case 1:
-		page = "workweekview";
-		break;
-	case 2:
-		page = "weekview";
-		break;
-	case 3:
-		page = "monthview";
-		break;
-	default:
-		page = "dayview";
-		break;
-	}
-
-	gnome_calendar_set_view (gcal, page, FALSE, FALSE);
+	gnome_calendar_set_view (gcal, "dayview", FALSE, FALSE);
 
 	return GTK_WIDGET (gcal);
 }