Start re-enabling parts of the calendar.

2 files changed, 0 insertions, 54 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 27a3d6d678..59138cce2c 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1206,24 +1206,6 @@ on_new_task (EPopup *ep, EPopupItem *pitem, gpointer data)
 }
 
 static void
-on_goto_date (EPopup *ep, EPopupItem *pitem, gpointer data)
-{
-	ECalendarView *cal_view = data;
-
-	goto_dialog (cal_view->priv->calendar);
-}
-
-static void
-on_goto_today (EPopup *ep, EPopupItem *pitem, gpointer data)
-{
-#if 0  /* KILL-BONOBO */
-	ECalendarView *cal_view = data;
-
-	gnome_calendar_goto_today (cal_view->priv->calendar);
-#endif
-}
-
-static void
 on_edit_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	ECalendarView *cal_view = data;
@@ -1283,28 +1265,6 @@ on_save_as (EPopup *ep, EPopupItem *pitem, gpointer data)
 }
 
 static void
-on_print_event (EPopup *ep, EPopupItem *pitem, gpointer data)
-{
-	ECalendarView *cal_view = data;
-	GList *selected;
-	ECalendarViewEvent *event;
-	ECalComponent *comp;
-
-	selected = e_calendar_view_get_selected_events (cal_view);
-	if (!selected)
-		return;
-
-	event = (ECalendarViewEvent *) selected->data;
-
-	comp = e_cal_component_new ();
-	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	print_comp (comp, event->comp_data->client, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
-
-	g_object_unref (comp);
-	g_list_free (selected);
-}
-
-static void
 transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_item)
 {
 	const gchar *uid;
@@ -1733,15 +1693,11 @@ static EPopupItem ecv_main_items [] = {
 	{ E_POPUP_BAR, (gchar *) "60." },
 	/* FIXME: hook in this somehow */
 	{ E_POPUP_SUBMENU, (gchar *) "60.view", (gchar *) N_("_Current View") },
-
-	{ E_POPUP_ITEM, (gchar *) "61.today", (gchar *) N_("Select T_oday"), on_goto_today, NULL, (gchar *) "go-today" },
-	{ E_POPUP_ITEM, (gchar *) "62.todate", (gchar *) N_("_Select Date..."), on_goto_date, NULL, (gchar *) GTK_STOCK_JUMP_TO },
 };
 
 static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), on_edit_appointment, NULL, (gchar *) GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
 	{ E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("Pri_nt..."), on_print_event, NULL, (gchar *) GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
 
 	{ E_POPUP_BAR, (gchar *) "30." },
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index fb68435769..1a8e5a1d76 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -575,7 +575,6 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 		   gint titleflags, time_t greystart, time_t greyend,
 		   gint bordertitle)
 {
-#if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	PangoFontDescription *font, *font_bold, *font_normal;
 	time_t now, next;
@@ -701,7 +700,6 @@ 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 */
@@ -1240,7 +1238,6 @@ 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;
@@ -1358,7 +1355,6 @@ 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). */
@@ -1729,7 +1725,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 		    gint 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;
@@ -1822,7 +1817,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	}
 	g_array_free (psi.events, TRUE);
 	g_array_free (spans, TRUE);
-#endif
 }
 
 /* XXX Evolution doesn't have a "year" view. */
@@ -2379,7 +2373,6 @@ 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,14 +2387,12 @@ 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;
 
@@ -2421,7 +2412,6 @@ 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 */