6 files changed, 23 insertions, 8 deletions
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 91e50f84eb..f0de87fddc 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -39,7 +39,9 @@
 #define SUMMARY_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory"
 
 static BonoboGenericFactory *factory = NULL;
+#ifdef WANT_THE_EXECUTIVE_SUMMARY
 static BonoboGenericFactory *summary_factory = NULL;
+#endif
 char *evolution_dir;
 
 static const EvolutionShellComponentFolderType folder_types[] = {
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 20c2bff234..cbf8a1195c 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -21,15 +21,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* We need this for strptime. */
-#define _XOPEN_SOURCE
 
 #include <config.h>
-#include <ctype.h>
 #include <math.h>
-#undef _XOPEN_SOURCE
-#include <sys/time.h>
+/* We need this for strptime. */
+#include <ctype.h>
 #define _XOPEN_SOURCE
+#define __USE_XOPEN
+#include <sys/time.h>
+#undef _XOPEN_SOURCE
+#undef __USE_XOPEN
 #include <time.h>
 #include <gnome.h>
 #include <cal-util/timeutil.h>
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 91e50f84eb..f0de87fddc 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -39,7 +39,9 @@
 #define SUMMARY_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory"
 
 static BonoboGenericFactory *factory = NULL;
+#ifdef WANT_THE_EXECUTIVE_SUMMARY
 static BonoboGenericFactory *summary_factory = NULL;
+#endif
 char *evolution_dir;
 
 static const EvolutionShellComponentFolderType folder_types[] = {
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 9078fcef73..0d941caaff 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -385,11 +385,12 @@ static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget
 							  guint           time,
 							  EDayView	 *day_view);
 
+#if 0
 static gboolean e_day_view_update_event_cb (EDayView *day_view,
 					    gint day,
 					    gint event_num,
 					    gpointer data);
-
+#endif
 static gboolean e_day_view_remove_event_cb (EDayView *day_view,
 					    gint day,
 					    gint event_num,
@@ -1362,7 +1363,9 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data)
 		else
 			event = &g_array_index (day_view->events[day],
 						EDayViewEvent, event_num);
+#ifndef NO_WARNINGS
 #warning "FIXME"
+#endif
 
 		/* Do this the long way every time for now */
 #if 0
@@ -1457,7 +1460,7 @@ e_day_view_set_cal_client	(EDayView	*day_view,
 	e_day_view_queue_reload_events (day_view);
 }
 
-
+#if 0
 static gboolean
 e_day_view_update_event_cb (EDayView *day_view,
 			    gint day,
@@ -1493,7 +1496,7 @@ e_day_view_update_event_cb (EDayView *day_view,
 	}
 	return TRUE;
 }
-
+#endif
 
 /* This calls a given function for each event instance (in both views).
    If the callback returns TRUE the iteration is stopped.
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index d50172787b..ee77573f6e 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -318,6 +318,11 @@ e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
 			draw_start = FALSE;
 			draw_end = FALSE;
 			break;
+		default:
+			g_assert_not_reached();
+			draw_start = FALSE;
+			draw_end = FALSE;
+			break;
 		}
 
 		if (draw_start) {
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 5b6c4960f4..a6d42b8bbd 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -891,7 +891,9 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data)
 	   update the event fairly easily without changing the events arrays
 	   or computing a new layout. */
 	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
+#ifndef NO_WARNINGS
 #warning "FIXME"
+#endif
 		event = &g_array_index (week_view->events, EWeekViewEvent,
 					event_num);