Re-enable more calendar code.

1 files changed, 3 insertions, 9 deletions

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
 }