Disable parts of my previous calendar work, such that all modules now load!

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

16 files changed, 174 insertions, 26 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 4cc002fb8a..b6ce23fa91 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -49,6 +49,8 @@ privsolib_LTLIBRARIES = libcal-gui.la
 # Removed from SOURCES
 #	cal-search-bar.c
 # 	cal-search-bar.h
+# 	gnome-cal.c
+# 	gnome-cal.h
 # 	main.c
 
 libcal_gui_la_SOURCES =		\
@@ -56,8 +58,6 @@ libcal_gui_la_SOURCES =		\
  	e-calendar-view.h			\
  	e-calendar-table.c			\
  	e-calendar-table.h			\
- 	gnome-cal.c				\
- 	gnome-cal.h				\
 	calendar-config.c			\
 	calendar-config.h			\
 	calendar-config-keys.h			\
@@ -172,6 +172,9 @@ libcal_gui_la_SOURCES =		\
 	weekday-picker.c			\
 	weekday-picker.h
 
+# Removed
+#	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
+
 libcal_gui_la_LIBADD =					\
 	$(WIN32_BOOTSTRAP_LIBS)						\
 	$(top_builddir)/widgets/menus/libmenus.la			\
@@ -183,7 +186,6 @@ libcal_gui_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
 	$(LIBSOUP_LIBS)							\
 	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index c4cabe1f45..62a8319935 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -242,8 +242,10 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
                                       GDK_CONTROL_MASK,
                                       "open_event", 0);
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
  	e_cal_view_a11y_init ();
+#endif
 }
 
 
@@ -251,6 +253,7 @@ void
 e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart,
 		      icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas)
 {
+#if 0  /* KILL-BONOBO */
 	ECalComponent *comp;
 	struct icaltimetype itime, old_dtstart, old_dtend;
 	time_t tt_start, tt_end, new_dtstart = 0;
@@ -379,6 +382,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 	}
 
 	g_object_unref (comp);
+#endif
 }
 
 static void
@@ -1106,11 +1110,13 @@ on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 static void
 on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
 {
+#if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
 	time_t dtstart, dtend;
 
 	e_calendar_view_get_selected_time_range (cal_view, &dtstart, &dtend);
 	gnome_calendar_new_task (cal_view->priv->calendar, &dtstart, &dtend);
+#endif
 }
 
 static void
@@ -1124,9 +1130,11 @@ on_goto_date (EPopup *ep, EPopupItem *pitem, void *data)
 static void
 on_goto_today (EPopup *ep, EPopupItem *pitem, void *data)
 {
+#if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
 
 	gnome_calendar_goto_today (cal_view->priv->calendar);
+#endif
 }
 
 static void
@@ -1851,7 +1859,9 @@ e_calendar_view_new_appointment (ECalendarView *cal_view)
 static void
 object_created_cb (CompEditor *ce, ECalendarView *cal_view)
 {
+#if 0  /* KILL-BONOBO */
 	gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_client (ce));
+#endif
 }
 
 static void
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 1d0b052440..76529d9533 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -111,7 +111,9 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class)
 			G_PARAM_WRITABLE));
 
 	/* init the accessibility support for e_day_view */
+#if 0  /* KILL-BONOBO */
  	e_day_view_main_item_a11y_init ();
+#endif
 }
 
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 8b73cd7ccf..03cffc9d93 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -467,8 +467,10 @@ e_day_view_class_init (EDayViewClass *class)
 	view_class->set_selected_time_range = e_day_view_set_selected_time_range;
 	view_class->get_visible_time_range = e_day_view_get_visible_time_range;
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
  	e_day_view_a11y_init ();
+#endif
 }
 
 static void
@@ -5513,6 +5515,7 @@ e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
 static void
 e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 {
+#if 0  /* KILL-BONOBO */
 	if (day_view->selection_start_day == 0) {
 		gnome_calendar_previous (e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)));
 	} else {
@@ -5526,12 +5529,14 @@ e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 		gtk_widget_queue_draw (day_view->main_canvas);
 	}
 	g_signal_emit_by_name (day_view, "selected_time_changed");
+#endif
 }
 
 
 static void
 e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 {
+#if 0 /* KILL-BONOBO */
 	if (day_view->selection_end_day == day_view->days_shown - 1) {
 		gnome_calendar_next (e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)));
 	} else {
@@ -5545,6 +5550,7 @@ e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 		gtk_widget_queue_draw (day_view->main_canvas);
 	}
 	g_signal_emit_by_name (day_view, "selected_time_changed");
+#endif
 }
 
 
@@ -6297,8 +6303,10 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 		if (!on_server) {
 			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
 				g_message (G_STRLOC ": Could not create the object!");
+#if 0  /* KILL-BONOBO */
 			else
 				gnome_calendar_emit_user_created_signal (day_view, e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)), client);
+#endif
 
 			/* we remove the object since we either got the update from the server or failed */
 			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index be69282a4a..322acc6676 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -91,8 +91,10 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
 			NULL,
 			G_PARAM_WRITABLE));
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_week_view_main_item */
  	e_week_view_main_item_a11y_init ();
+#endif
 }
 
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 3a5dd92e2f..6b9e43f581 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -225,8 +225,10 @@ e_week_view_class_init (EWeekViewClass *class)
 	view_class->set_selected_time_range = e_week_view_set_selected_time_range;
 	view_class->get_visible_time_range = e_week_view_get_visible_time_range;
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_week_view */
 	e_week_view_a11y_init ();
+#endif
 }
 
 static void
@@ -3572,8 +3574,10 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 		if (!on_server) {
 			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
 				g_message (G_STRLOC ": Could not create the object!");
+#if 0  /* KILL-BONOBO */
 			else
 				gnome_calendar_emit_user_created_signal (week_view, e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view)), client);
+#endif
 
 			/* we remove the object since we either got the update from the server or failed */
 			e_week_view_remove_event_cb (week_view, event_num, NULL);
@@ -3931,6 +3935,7 @@ e_week_view_cursor_key_right (EWeekView *week_view, GnomeCalendarViewType view_t
 static gboolean
 e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 {
+#if 0  /* KILL-BONOBO */
 	EWeekView *week_view;
 	ECal *ecal;
 	ECalModel *model;
@@ -4105,6 +4110,7 @@ e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 		g_free (initial_text);
 
 	g_object_unref (comp);
+#endif
 
 	return TRUE;
 }
@@ -4187,6 +4193,7 @@ e_week_view_popup_menu (GtkWidget *widget)
 void
 e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item)
 {
+#if 0  /* KILL-BONOBO */
 	gint day;
 	GnomeCalendar *calendar;
 
@@ -4202,6 +4209,7 @@ e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item)
 			return;
 		}
 	}
+#endif
 }
 
 static gboolean
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index f345bbb7df..14f9901a38 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -79,12 +79,14 @@ month_changed (GtkToggleButton *toggle, gpointer data)
 static void
 ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
 {
+#if 0  /* KILL-BONOBO */
 	GoToDialog *dlg = user_data;
 	ECal *client;
 
 	client = gnome_calendar_get_default_client (dlg->gcal);
 	if (client)
 		tag_calendar_by_client (dlg->ecal, client);
+#endif
 }
 
 /* Event handler for day groups in the month item.  A button press makes the calendar jump to the
@@ -93,6 +95,7 @@ ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
 static void
 ecal_event (ECalendarItem *calitem, gpointer user_data)
 {
+#if 0  /* KILL-BONOBO */
 	GoToDialog *dlg = user_data;
 	GDate start_date, end_date;
 	struct icaltimetype tt = icaltime_null_time ();
@@ -110,6 +113,7 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
 
 	gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
 	/* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
+#endif
 }
 
 /* Returns the current time, for the ECalendarItem. */
@@ -164,7 +168,9 @@ create_ecal (GoToDialog *dlg)
 static void
 goto_today (GoToDialog *dlg)
 {
+#if 0  /* KILL-BONOBO */
 	gnome_calendar_goto_today (dlg->gcal);
+#endif
 }
 
 /* Gets the widgets from the XML file and returns if they are all available. */
@@ -209,6 +215,7 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 void
 goto_dialog (GnomeCalendar *gcal)
 {
+#if 0  /* KILL-BONOBO */
 	time_t start_time;
 	struct icaltimetype tt;
 	int b;
@@ -277,4 +284,5 @@ goto_dialog (GnomeCalendar *gcal)
 	g_object_unref (dlg->xml);
 	g_free (dlg);
 	dlg = NULL;
+#endif
 }
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 231067bf1f..67b2f729b0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -581,6 +581,7 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 		   int titleflags, time_t greystart, time_t greyend,
 		   int bordertitle)
 {
+#if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	PangoFontDescription *font, *font_bold, *font_normal;
 	time_t now, next;
@@ -705,6 +706,7 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 	}
 	pango_font_description_free (font_normal);
 	pango_font_description_free (font_bold);
+#endif
 }
 
 /* wraps text into the print context, not taking up more than its allowed space */
@@ -1241,6 +1243,7 @@ static void
 print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		   double left, double right, double top, double bottom)
 {
+#if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	EDayViewEvent *event;
 	PangoFontDescription *font;
@@ -1359,6 +1362,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 	g_array_free (pdi.long_events, TRUE);
 	free_event_array (pdi.events[0]);
 	g_array_free (pdi.events[0], TRUE);
+#endif
 }
 
 /* Returns TRUE if the event is a one-day event (i.e. not a long event). */
@@ -1733,6 +1737,7 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 		    int month, double font_size,
 		    double left, double right, double top, double bottom)
 {
+#if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	EWeekViewEvent *event;
 	struct psinfo psi;
@@ -1826,6 +1831,7 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	}
 	g_array_free (psi.events, TRUE);
 	g_array_free (spans, TRUE);
+#endif
 }
 
 
@@ -1957,6 +1963,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		    time_t start, time_t end,
 		    double left, double right, double top, double bottom)
 {
+#if 0  /* KILL-BONOBO */
 	PangoFontDescription *font_summary;
 	double y, yend, x, xend;
 	struct icaltimetype *tt;
@@ -2046,6 +2053,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 	}
 
 	pango_font_description_free (font_summary);
+#endif
 }
 
 static void
@@ -2380,6 +2388,7 @@ print_calendar_draw_page (GtkPrintOperation *operation,
                           gint page_nr,
                           PrintCalItem *pcali)
 {
+#if 0 /* KILL-BONOBO */
 	switch (gnome_calendar_get_view (pcali->gcal)) {
 		case GNOME_CAL_DAY_VIEW:
 			print_day_view (context, pcali->gcal, pcali->start);
@@ -2394,12 +2403,14 @@ print_calendar_draw_page (GtkPrintOperation *operation,
 		default:
 			g_return_if_reached ();
 	}
+#endif
 }
 
 void
 print_calendar (GnomeCalendar *gcal, GtkPrintOperationAction action,
                 time_t start)
 {
+#if 0  /* KILL-BONOBO */
 	GtkPrintOperation *operation;
 	PrintCalItem pcali;
 
@@ -2419,6 +2430,7 @@ print_calendar (GnomeCalendar *gcal, GtkPrintOperationAction action,
 	gtk_print_operation_run (operation, action, NULL, NULL);
 
 	g_object_unref (operation);
+#endif
 }
 
 /* returns number of required pages, when page_nr is -1 */
diff --git a/calendar/modules/e-cal-shell-content.c b/calendar/modules/e-cal-shell-content.c
index 8300c657ca..879420a307 100644
--- a/calendar/modules/e-cal-shell-content.c
+++ b/calendar/modules/e-cal-shell-content.c
@@ -26,6 +26,13 @@
 #include "e-util/gconf-bridge.h"
 
 #include "calendar/gui/calendar-config.h"
+#include "calendar/gui/e-cal-list-view-config.h"
+#include "calendar/gui/e-cal-model-calendar.h"
+#include "calendar/gui/e-calendar-table.h"
+#include "calendar/gui/e-calendar-table-config.h"
+#include "calendar/gui/e-day-view-config.h"
+#include "calendar/gui/e-memo-table-config.h"
+#include "calendar/gui/e-week-view-config.h"
 
 #include "widgets/menus/gal-view-etable.h"
 
@@ -95,6 +102,8 @@ cal_shell_content_display_view_cb (ECalShellContent *cal_shell_content,
 static FocusLocation
 cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
 {
+        return FOCUS_OTHER;
+#if 0  /* TEMPORARILY DISABLED */
 	GtkWidget *widget;
 	GnomeCalendar *calendar;
 	ECalendarTable *task_table;
@@ -149,6 +158,7 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
 	}
 
 	return FOCUS_OTHER;
+#endif
 }
 
 static void
@@ -292,12 +302,12 @@ cal_shell_content_constructed (GObject *object)
 {
 	ECalShellContentPrivate *priv;
 	ECalModelCalendar *cal_model;
-	EShellContent *shell-content;
+	EShellContent *shell_content;
 	EShellModule *shell_module;
 	EShellView *shell_view;
 	EShellViewClass *shell_view_class;
 	GalViewCollection *view_collection;
-	GalViewInstnace *view_instance;
+	GalViewInstance *view_instance;
 	GtkWidget *container;
 	GtkWidget *widget;
 	const gchar *config_dir;
@@ -348,7 +358,7 @@ cal_shell_content_constructed (GObject *object)
 	 *       Month view has its own position. */
 	widget = gtk_vpaned_new ();
 	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
-	priv->vpaned = g_object_ref ();
+	priv->vpaned = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	container = priv->notebook;
@@ -357,6 +367,7 @@ cal_shell_content_constructed (GObject *object)
 	 * that the notebook page number corresponds to the view type.
 	 * The assertions below ensure that stays true. */
 
+#if 0  /* Not so fast... get the memo/task pads working first. */
 	/* FIXME Need to establish a calendar and timezone first. */
 	widget = e_day_view_new (E_CAL_MODEL (cal_model));
 	e_calendar_view_set_calendar (
@@ -420,6 +431,7 @@ cal_shell_content_constructed (GObject *object)
 	g_return_if_fail (page_num == GNOME_CAL_LIST_VIEW);
 	priv->list_view = g_object_ref (widget);
 	gtk_widget_show (widget);
+#endif
 
 	container = priv->vpaned;
 
@@ -440,9 +452,9 @@ cal_shell_content_constructed (GObject *object)
 	gtk_widget_show (widget);
 	g_free (markup);
 
-	widget = e_calendar_table_new ();
+	widget = e_calendar_table_new (shell_view);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	priv->task_table = g_object_ref ();
+	priv->task_table = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	filename = g_build_filename (config_dir, "TaskPad", NULL);
@@ -464,9 +476,9 @@ cal_shell_content_constructed (GObject *object)
 	gtk_widget_show (widget);
 	g_free (markup);
 
-	widget = e_memo_table_new ();
+	widget = e_memo_table_new (shell_view);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	priv->memo_table = g_object_ref ();
+	priv->memo_table = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	filename = g_build_filename (config_dir, "MemoPad", NULL);
@@ -572,7 +584,9 @@ e_cal_shell_content_get_calendar (ECalShellContent *cal_shell_content)
 	g_return_val_if_fail (
 		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
 
-	return GNOME_CALENDAR (cal_shell_content->priv->calendar);
+        /* FIXME */
+	/*return GNOME_CALENDAR (cal_shell_content->priv->calendar);*/
+        return NULL;
 }
 
 EMemoTable *
@@ -599,7 +613,9 @@ e_cal_shell_content_get_timezone (ECalShellContent *cal_shell_content)
 	g_return_val_if_fail (
 		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
 
-	return cal_shell_content->priv->timezone;
+        /* FIXME */
+	/*return cal_shell_content->priv->timezone;*/
+        return NULL;
 }
 
 GalViewInstance *
@@ -614,6 +630,7 @@ e_cal_shell_content_get_view_instance (ECalShellContent *cal_shell_content)
 void
 e_cal_shell_content_copy_clipboard (ECalShellContent *cal_shell_content)
 {
+#if 0
 	GnomeCalendar *calendar;
 	EMemoTable *memo_table;
 	ECalendarTable *task_table;
@@ -640,11 +657,13 @@ e_cal_shell_content_copy_clipboard (ECalShellContent *cal_shell_content)
 		default:
 			g_return_if_reached ();
 	}
+#endif
 }
 
 void
 e_cal_shell_content_cut_clipboard (ECalShellContent *cal_shell_content)
 {
+#if 0
 	GnomeCalendar *calendar;
 	EMemoTable *memo_table;
 	ECalendarTable *task_table;
@@ -671,11 +690,13 @@ e_cal_shell_content_cut_clipboard (ECalShellContent *cal_shell_content)
 		default:
 			g_return_if_reached ();
 	}
+#endif
 }
 
 void
 e_cal_shell_content_paste_clipboard (ECalShellContent *cal_shell_content)
 {
+#if 0
 	GnomeCalendar *calendar;
 	EMemoTable *memo_table;
 	ECalendarTable *task_table;
@@ -702,11 +723,13 @@ e_cal_shell_content_paste_clipboard (ECalShellContent *cal_shell_content)
 		default:
 			g_return_if_reached ();
 	}
+#endif
 }
 
 void
 e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
 {
+#if 0
 	GnomeCalendar *calendar;
 	EMemoTable *memo_table;
 	ECalendarTable *task_table;
@@ -733,11 +756,13 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
 		default:
 			g_return_if_reached ();
 	}
+#endif
 }
 
 void
 e_cal_shell_content_delete_selected_occurrence (ECalShellContent *cal_shell_content)
 {
+#if 0
 	GnomeCalendar *calendar;
 	FocusLocation focus;
 
@@ -748,4 +773,5 @@ e_cal_shell_content_delete_selected_occurrence (ECalShellContent *cal_shell_cont
 
 	if (focus == FOCUS_CALENDAR)
 		gnome_calendar_delete_selected_occurrence (calendar);
+#endif
 }
diff --git a/calendar/modules/e-cal-shell-sidebar.c b/calendar/modules/e-cal-shell-sidebar.c
index 707770df81..06d09b07ed 100644
--- a/calendar/modules/e-cal-shell-sidebar.c
+++ b/calendar/modules/e-cal-shell-sidebar.c
@@ -408,7 +408,6 @@ cal_shell_sidebar_constructed (GObject *object)
 	calitem = E_CALENDAR (widget)->calitem;
 	e_calendar_item_set_days_start_week_sel (calitem, 9);
 	e_calendar_item_set_max_days_sel (calitem, 42);
-	widget = gnome_calendar_new (shell_view);
 	gtk_paned_add2 (GTK_PANED (container), widget);
 	priv->mini_calendar = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -466,7 +465,8 @@ static void
 cal_shell_sidebar_client_added (ECalShellSidebar *cal_shell_sidebar,
                                 ECal *client)
 {
-	cal_shell_sidebar_update_timezone (cal_shell_sidebar);
+        /* FIXME */
+	/*cal_shell_sidebar_update_timezone (cal_shell_sidebar);*/
 }
 
 static void
diff --git a/calendar/modules/e-cal-shell-view-actions.c b/calendar/modules/e-cal-shell-view-actions.c
index 4e077b273f..7de429c3e8 100644
--- a/calendar/modules/e-cal-shell-view-actions.c
+++ b/calendar/modules/e-cal-shell-view-actions.c
@@ -48,6 +48,7 @@ static void
 action_calendar_delete_cb (GtkAction *action,
                            ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	ECalShellSidebar *cal_shell_sidebar;
 	EShellWindow *shell_window;
@@ -113,38 +114,44 @@ action_calendar_delete_cb (GtkAction *action,
 		g_warning ("%s", error->message);
 		g_error_free (error);
 	}
+#endif
 }
 
 static void
 action_calendar_go_back_cb (GtkAction *action,
                             ECalShellView *cal_shell_view)
 {
+#if 0 
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
-	calendar = e_shell_content_get_calendar (cal_shell_content);
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
 
-	gnome_claendar_previous (calendar);
+	gnome_calendar_previous (calendar);
+#endif
 }
 
 static void
 action_calendar_go_forward_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
-	calendar = e_shell_content_get_calendar (cal_shell_content);
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
 
 	gnome_calendar_next (calendar);
+#endif
 }
 
 static void
 action_calendar_go_today_cb (GtkAction *action,
                              ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 
@@ -152,12 +159,14 @@ action_calendar_go_today_cb (GtkAction *action,
 	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
 
 	gnome_calendar_goto_today (calendar);
+#endif
 }
 
 static void
 action_calendar_jump_to_cb (GtkAction *action,
                             ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 
@@ -165,24 +174,28 @@ action_calendar_jump_to_cb (GtkAction *action,
 	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
 
 	goto_dialog (calendar);
+#endif
 }
 
 static void
 action_calendar_new_cb (GtkAction *action,
                         ECalShellView *cal_shell_view)
 {
+#if 0
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 
 	shell_view = E_SHELL_VIEW (cal_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	calendar_setup_new_calendar (GTK_WINDOW (shell_window));
+#endif
 }
 
 static void
 action_calendar_print_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 	GtkPrintOperationAction print_action;
@@ -206,13 +219,14 @@ action_calendar_print_cb (GtkAction *action,
 		gnome_calendar_get_current_time_range (calendar, &start, NULL);
 		print_calendar (calendar, action, start);
 	}
+#endif
 }
 
 static void
 action_calendar_print_preview_cb (GtkAction *action,
                                   ECalShellView *cal_shell_view)
 {
-}
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 	GtkPrintOperationAction print_action;
@@ -236,11 +250,14 @@ action_calendar_print_preview_cb (GtkAction *action,
 		gnome_calendar_get_current_time_range (calendar, &start, NULL);
 		print_calendar (calendar, action, start);
 	}
+#endif
+}
 
 static void
 action_calendar_properties_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellSidebar *cal_shell_sidebar;
 	EShellView *shell_view;
 	EShellWindow *shell_window;
@@ -256,6 +273,7 @@ action_calendar_properties_cb (GtkAction *action,
 	g_return_if_fail (E_IS_SOURCE (source));
 
 	calendar_setup_edit_calendar (GTK_WINDOW (shell_window), source);
+#endif
 }
 
 static void
@@ -306,6 +324,13 @@ action_calendar_view_cb (GtkRadioAction *action,
 }
 
 static void
+action_event_all_day_new_cb (GtkAction *action,
+                             ECalShellView *cal_shell_view)
+{
+        /* FIXME */
+}
+
+static void
 action_event_clipboard_copy_cb (GtkAction *action,
                                 ECalShellView *cal_shell_view)
 {
@@ -355,7 +380,7 @@ action_event_delete_cb (GtkAction *action,
 {
 	ECalShellContent *cal_shell_content;
 
-	cal_shell_content = cal_shell-view->priv->cal_shell_content;
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	e_cal_shell_content_delete_selection (cal_shell_content);
 }
 
@@ -374,7 +399,6 @@ action_event_delete_occurrence_all_cb (GtkAction *action,
                                        ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	GnomeCalendar *calendar;
 
 	/* XXX Same as "event-delete". */
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
@@ -389,6 +413,13 @@ action_event_forward_cb (GtkAction *action,
 }
 
 static void
+action_event_meeting_new_cb (GtkAction *action,
+                             ECalShellView *cal_shell_view)
+{
+        /* FIXME */
+}
+
+static void
 action_event_move_cb (GtkAction *action,
                       ECalShellView *cal_shell_view)
 {
@@ -396,6 +427,13 @@ action_event_move_cb (GtkAction *action,
 }
 
 static void
+action_event_new_cb (GtkAction *action,
+                     ECalShellView *cal_shell_view)
+{
+        /* FIXME */
+}
+
+static void
 action_event_occurrence_movable_cb (GtkAction *action,
                                     ECalShellView *cal_shell_view)
 {
@@ -406,6 +444,7 @@ static void
 action_event_open_cb (GtkAction *action,
                       ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 	GtkWidget *widget;
@@ -415,6 +454,7 @@ action_event_open_cb (GtkAction *action,
 	widget = gnome_calendar_get_current_view_widget (calendar);
 
 	e_calendar_view_open_event (E_CALENDAR_VIEW (widget));
+#endif
 }
 
 static void
@@ -476,6 +516,7 @@ static void
 action_search_execute_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
 {
+#if 0
 	EShellView *shell_view;
 
 	/* All shell views respond to the activation of this action,
@@ -486,6 +527,7 @@ action_search_execute_cb (GtkAction *action,
 		return;
 
 	e_cal_shell_view_execute_search (cal_shell_view);
+#endif
 }
 
 static void
@@ -493,7 +535,9 @@ action_search_filter_cb (GtkRadioAction *action,
                          GtkRadioAction *current,
                          ECalShellView *cal_shell_view)
 {
+#if 0
 	e_cal_shell_view_execute_search (cal_shell_view);
+#endif
 }
 
 static GtkActionEntry calendar_entries[] = {
@@ -643,7 +687,7 @@ static GtkActionEntry calendar_entries[] = {
 	  N_("_Forward as iCalendar..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
-	  G_CALLBACK (action_event_forward_new_cb) },
+	  G_CALLBACK (action_event_forward_cb) },
 
 	{ "event-meeting-new",
 	  NULL,
@@ -713,7 +757,16 @@ static GtkActionEntry calendar_entries[] = {
 	  N_("_Schedule Meeting..."),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
-	  G_CALLBACK (action_event_schedule_cb) }
+	  G_CALLBACK (action_event_schedule_cb) },
+
+        /*** Menus ***/
+
+        { "calendar-actions-menu",
+          NULL,
+          N_("_Actions"),
+          NULL,
+          NULL,
+          NULL }
 };
 
 static GtkRadioActionEntry calendar_view_entries[] = {
@@ -842,6 +895,12 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 
 	/* Fine tuning. */
 
+        action = ACTION (CALENDAR_GO_TODAY);
+        g_object_set (action, "short-label", _("Today"), NULL);
+
+        action = ACTION (CALENDAR_JUMP_TO);
+        g_object_set (action, "short-label", _("Go To"), NULL);
+
 	action = ACTION (EVENT_DELETE);
 	g_object_set (action, "short-label", _("Delete"), NULL);
 
diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c
index 65be70ae93..d5b15a370f 100644
--- a/calendar/modules/e-cal-shell-view-private.c
+++ b/calendar/modules/e-cal-shell-view-private.c
@@ -27,6 +27,7 @@
 static void
 cal_shell_view_update_timezone (ECalShellView *cal_shell_view)
 {
+#if 0
 	ECalShellContent *cal_shell_content;
 	ECalShellSidebar *cal_shell_sidebar;
 	GnomeCalendarViewType view_type;
@@ -44,6 +45,7 @@ cal_shell_view_update_timezone (ECalShellView *cal_shell_view)
 
 	timezone = calendar_config_get_icaltimezone ();
 	e_calendar_view_get_icaltimezone (calendar_view, timezone);
+#endif
 }
 
 static void
@@ -265,13 +267,15 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 
 	/* Listen for configuration changes. */
 
+#if 0
 	notification = calendar_config_add_notification_timezone (
 		cal_shell_view_timezone_changed_cb, cal_shell_view);
 	priv->notifications = g_list_prepend (
 		priv->notifications, GUINT_TO_POINTER (notification));
 	cal_shell_view_update_timezone (cal_shell_view);
+#endif
 
-	e_shell_view_update_actions (shell_view);
+	e_cal_shell_view_actions_init (shell_view);
 	e_cal_shell_view_update_sidebar (cal_shell_view);
 }
 
@@ -383,6 +387,7 @@ e_cal_shell_view_set_status_message (ECalShellView *cal_shell_view,
 void
 e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view)
 {
+#if 0  /* KILL-BONOBO */
 	EShellView *shell_view;
 	EShellSidebar *shell_sidebar;
 	GnomeCalendar *calendar;
@@ -503,5 +508,5 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view)
 	}
 
 	e_shell_sidebar_set_secondary_text (shell_sidebar, buffer);
+#endif
 }
-
diff --git a/calendar/modules/e-cal-shell-view-private.h b/calendar/modules/e-cal-shell-view-private.h
index bf246cd4ac..6187e2b749 100644
--- a/calendar/modules/e-cal-shell-view-private.h
+++ b/calendar/modules/e-cal-shell-view-private.h
@@ -27,16 +27,18 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-categories.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-util.h"
 
 #include "calendar/gui/comp-util.h"
+#include "calendar/gui/e-cal-list-view.h"
 #include "calendar/gui/e-cal-model-tasks.h"
 #include "calendar/gui/e-calendar-view.h"
 #include "calendar/gui/gnome-cal.h"
-#include "calendar/gui/goto.h"
+/*#include "calendar/gui/goto.h"*/
 #include "calendar/gui/print.h"
 #include "calendar/gui/dialogs/copy-source-dialog.h"
 #include "calendar/gui/dialogs/event-editor.h"
diff --git a/calendar/modules/e-cal-shell-view.c b/calendar/modules/e-cal-shell-view.c
index 4e966024bd..9100986280 100644
--- a/calendar/modules/e-cal-shell-view.c
+++ b/calendar/modules/e-cal-shell-view.c
@@ -76,6 +76,7 @@ cal_shell_view_constructed (GObject *object)
 static void
 cal_shell_view_update_actions (EShellView *shell_view)
 {
+#if 0
 	ECalShellViewPrivate *priv;
 	ECalShellContent *cal_shell_content;
 	ECalShellSidebar *cal_shell_sidebar;
@@ -166,6 +167,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	action = ACTION (EVENT_OPEN);
 	sensitive = (n_selected == 1);
 	gtk_action_set_sensitive (action, sensitive);
+#endif
 }
 
 static void
@@ -186,7 +188,7 @@ cal_shell_view_class_init (ECalShellViewClass *class,
 
 	shell_view_class = E_SHELL_VIEW_CLASS (class);
 	shell_view_class->label = _("Calendar");
-	shell_view_class->icon_name = "evolution-calendar";
+	shell_view_class->icon_name = "x-office-calendar";
 	shell_view_class->ui_definition = "evolution-calendars.ui";
 	shell_view_class->search_options = "/calendar-search-options";
 	shell_view_class->search_rules = "caltypes.xml";
diff --git a/calendar/modules/e-task-shell-view-actions.c b/calendar/modules/e-task-shell-view-actions.c
index 805089ea8b..9a5bca34d9 100644
--- a/calendar/modules/e-task-shell-view-actions.c
+++ b/calendar/modules/e-task-shell-view-actions.c
@@ -588,6 +588,7 @@ action_task_purge_cb (GtkAction *action,
 purge:
 
 	/* FIXME */
+        ;
 }
 
 static void
diff --git a/calendar/modules/e-task-shell-view-private.h b/calendar/modules/e-task-shell-view-private.h
index 4d059419cd..dfb5c98d10 100644
--- a/calendar/modules/e-task-shell-view-private.h
+++ b/calendar/modules/e-task-shell-view-private.h
@@ -36,6 +36,7 @@
 #include "e-util/gconf-bridge.h"
 
 #include "calendar/common/authentication.h"
+#include "calendar/gui/calendar-config.h"
 #include "calendar/gui/comp-util.h"
 #include "calendar/gui/e-cal-component-preview.h"
 #include "calendar/gui/e-cal-model-tasks.h"