Re-enable more calendar code.

9 files changed, 14 insertions, 31 deletions

diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index e82bd3c796..f8c15b02ff 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "e-cal-list-view.h"
-/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
+#include "ea-calendar.h"
 
 #include <math.h>
 #include <time.h>
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index a56dbc02fc..7450cd1221 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -43,6 +43,7 @@
 #include "common/authentication.h"
 #include "calendar-config.h"
 #include "comp-util.h"
+#include "ea-calendar.h"
 #include "e-cal-model-calendar.h"
 #include "e-calendar-view.h"
 #include "itip-utils.h"
@@ -56,7 +57,6 @@
 #include "dialogs/select-source-dialog.h"
 #include "print.h"
 #include "goto.h"
-/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 #include "misc.h"
 
 #define E_CALENDAR_VIEW_GET_PRIVATE(obj) \
@@ -307,10 +307,8 @@ e_calendar_view_class_init (ECalendarViewClass *class)
 	gtk_binding_entry_add_signal (
 		binding_set, GDK_o, GDK_CONTROL_MASK, "open-event", 0);
 
-#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
 	e_cal_view_a11y_init ();
-#endif
 }
 
 static void
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index f0e988ac61..a3f951b276 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -32,7 +32,7 @@
 #include "e-util/e-categories-config.h"
 #include "e-day-view-layout.h"
 #include "e-day-view-main-item.h"
-/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
+#include "ea-calendar.h"
 #include "e-calendar-view.h"
 #include "comp-util.h"
 #include "calendar-config.h"
@@ -112,9 +112,7 @@ 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
 }
 
 static void
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 17cd345b63..cb69eecf50 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "e-day-view.h"
-/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
+#include "ea-calendar.h"
 
 #include <math.h>
 #include <time.h>
@@ -790,10 +790,8 @@ e_day_view_class_init (EDayViewClass *class)
 			0,
 			G_PARAM_READWRITE));
 
-#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
 	e_day_view_a11y_init ();
-#endif
 }
 
 static void
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index ed4d14232b..21db0a8e27 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include "e-week-view-main-item.h"
-/*#include "ea-calendar.h"*/  /* KILL-BONOBO */
+#include "ea-calendar.h"
 #include "calendar-config.h"
 
 static void e_week_view_main_item_set_property	(GObject	 *object,
@@ -92,10 +92,8 @@ 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
 }
 
 static void
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 663f1bf223..c090acc115 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "e-week-view.h"
-/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
+#include "ea-calendar.h"
 
 #include <math.h>
 #include <gdk/gdkkeysyms.h>
@@ -445,10 +445,8 @@ e_week_view_class_init (EWeekViewClass *class)
 			TRUE,
 			G_PARAM_READWRITE));
 
-#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_week_view */
 	e_week_view_a11y_init ();
-#endif
 }
 
 static void
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 2fa1a38a52..defda15875 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -134,10 +134,6 @@ struct _GnomeCalendarPrivate {
 	   it uses the date range set in search bar */
 	gboolean lview_select_daten_range;
 
-	/* We should know which calendar has been used to create object, so store it here
-	   before emitting "user_created" signal and make it NULL just after the emit. */
-	ECal *user_created_cal;
-
 	/* used in update_todo_view, to prevent interleaving when called in separate thread */
 	GMutex *todo_update_lock;
 };
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index b795ad9291..6e68ec71ee 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -75,7 +75,6 @@ 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;
 	ECalModel *model;
 	ECal *client;
@@ -84,7 +83,6 @@ ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
 	client = e_cal_model_get_default_client (model);
 	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,7 +91,6 @@ 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;
 	ECalModel *model;
@@ -114,7 +111,6 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
 	gnome_calendar_goto (dlg->gcal, et);
 
 	gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
-#endif
 }
 
 /* Returns the current time, for the ECalendarItem. */
@@ -169,9 +165,7 @@ 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. */
@@ -212,10 +206,10 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 void
 goto_dialog (GnomeCalendar *gcal)
 {
-#if 0  /* KILL-BONOBO */
 	ECalModel *model;
 	time_t start_time;
 	struct icaltimetype tt;
+	icaltimezone *timezone;
 	gint b;
 	gchar *gladefile;
 
@@ -245,8 +239,9 @@ goto_dialog (GnomeCalendar *gcal)
 	dlg->gcal = gcal;
 
 	model = gnome_calendar_get_model (gcal);
+	timezone = e_cal_model_get_timezone (model);
 	e_cal_model_get_time_range (model, &start_time, NULL);
-	tt = icaltime_from_timet_with_zone (start_time, FALSE, gnome_calendar_get_timezone (gcal));
+	tt = icaltime_from_timet_with_zone (start_time, FALSE, timezone);
 	dlg->year_val = tt.year;
 	dlg->month_val = tt.month - 1;
 	dlg->day_val = tt.day;
@@ -283,5 +278,4 @@ goto_dialog (GnomeCalendar *gcal)
 	g_object_unref (dlg->xml);
 	g_free (dlg);
 	dlg = NULL;
-#endif
 }
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 6601228ad3..1b9c8d367a 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -441,8 +441,6 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 		date_navigator->calitem, (ECalendarItemGetTimeCallback)
 		cal_shell_view_get_current_time, cal_shell_view, NULL);
 
-	/* KILL-BONOBO FIXME -- Need to connect to the "user-created"
-	 *                      signal for each ECalendarView. */
 	for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) {
 		ECalendarView *calendar_view;
 
@@ -453,6 +451,11 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 			calendar_view, "popup-event",
 			G_CALLBACK (cal_shell_view_popup_event_cb),
 			cal_shell_view);
+
+		g_signal_connect_swapped (
+			calendar_view, "user-created",
+			G_CALLBACK (cal_shell_view_user_created_cb),
+			cal_shell_view);
 	}
 
 	g_signal_connect_swapped (