From dbd93b798184e94e492280bc81644477f8947168 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 18 Aug 2009 15:03:42 -0400
Subject: Re-enable more calendar bits.

---
 calendar/gui/e-day-view.c  | 4 ----
 calendar/gui/e-week-view.c | 7 -------
 mail/em-folder-tree.c      | 2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index cda3d1f92c..17cd345b63 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5903,7 +5903,6 @@ 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 {
@@ -5917,13 +5916,11 @@ 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 {
@@ -5937,7 +5934,6 @@ 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
 }
 
 /* Scrolls the main canvas up or down. The pages_to_scroll argument
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 8cf36bc791..663f1bf223 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -4037,8 +4037,6 @@ e_week_view_cursor_key_right (EWeekView *week_view)
 static gboolean
 e_week_view_add_new_event_in_selected_range (EWeekView *week_view, const gchar *initial_text)
 {
-#if 0  /* KILL-BONOBO */
-	EWeekView *week_view;
 	ECal *ecal;
 	ECalModel *model;
 	ECalComponent *comp;
@@ -4225,7 +4223,6 @@ e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 		g_free (initial_text);
 
 	return ret_val;
-#endif
 }
 
 static gint
@@ -4261,7 +4258,6 @@ e_week_view_get_adjust_days_for_move_right (EWeekView *week_view,gint current_da
 static gboolean
 e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
 {
-#if 0  /* KILL-BONOBO */
 	gboolean handled = FALSE;
 	handled = e_week_view_do_key_press (widget, event);
 
@@ -4269,7 +4265,6 @@ e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
 	if (!handled)
 		handled = GTK_WIDGET_CLASS (e_week_view_parent_class)->key_press_event (widget, event);
 	return handled;
-#endif
 }
 
 void
@@ -4294,7 +4289,6 @@ 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;
 
@@ -4310,7 +4304,6 @@ e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item)
 			return;
 		}
 	}
-#endif
 }
 
 static gboolean
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 0c82851e62..7c9293ca19 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -891,7 +891,7 @@ folder_tree_new (EMFolderTree *emft)
 
 	gconf = mail_config_get_gconf_client ();
 
-	/* FIXME[KILL-BONOBO] Gross hack */
+	/* FIXME Gross hack */
 	tree = GTK_WIDGET (emft);
 	GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
 
-- 
cgit