Disable parts of my previous calendar work, such that all modules now load!

svn path=/branches/kill-bonobo/; revision=36690

8 files changed, 55 insertions, 3 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 4cc002fb8a..b6ce23fa91 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -49,6 +49,8 @@ privsolib_LTLIBRARIES = libcal-gui.la
 # Removed from SOURCES
 #	cal-search-bar.c
 # 	cal-search-bar.h
+# 	gnome-cal.c
+# 	gnome-cal.h
 # 	main.c
 
 libcal_gui_la_SOURCES =		\
@@ -56,8 +58,6 @@ libcal_gui_la_SOURCES =		\
  	e-calendar-view.h			\
  	e-calendar-table.c			\
  	e-calendar-table.h			\
- 	gnome-cal.c				\
- 	gnome-cal.h				\
 	calendar-config.c			\
 	calendar-config.h			\
 	calendar-config-keys.h			\
@@ -172,6 +172,9 @@ libcal_gui_la_SOURCES =		\
 	weekday-picker.c			\
 	weekday-picker.h
 
+# Removed
+#	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
+
 libcal_gui_la_LIBADD =					\
 	$(WIN32_BOOTSTRAP_LIBS)						\
 	$(top_builddir)/widgets/menus/libmenus.la			\
@@ -183,7 +186,6 @@ libcal_gui_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
 	$(LIBSOUP_LIBS)							\
 	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index c4cabe1f45..62a8319935 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -242,8 +242,10 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
                                       GDK_CONTROL_MASK,
                                       "open_event", 0);
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
  	e_cal_view_a11y_init ();
+#endif
 }
 
 
@@ -251,6 +253,7 @@ void
 e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart,
 		      icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas)
 {
+#if 0  /* KILL-BONOBO */
 	ECalComponent *comp;
 	struct icaltimetype itime, old_dtstart, old_dtend;
 	time_t tt_start, tt_end, new_dtstart = 0;
@@ -379,6 +382,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 	}
 
 	g_object_unref (comp);
+#endif
 }
 
 static void
@@ -1106,11 +1110,13 @@ on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 static void
 on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
 {
+#if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
 	time_t dtstart, dtend;
 
 	e_calendar_view_get_selected_time_range (cal_view, &dtstart, &dtend);
 	gnome_calendar_new_task (cal_view->priv->calendar, &dtstart, &dtend);
+#endif
 }
 
 static void
@@ -1124,9 +1130,11 @@ on_goto_date (EPopup *ep, EPopupItem *pitem, void *data)
 static void
 on_goto_today (EPopup *ep, EPopupItem *pitem, void *data)
 {
+#if 0  /* KILL-BONOBO */
 	ECalendarView *cal_view = data;
 
 	gnome_calendar_goto_today (cal_view->priv->calendar);
+#endif
 }
 
 static void
@@ -1851,7 +1859,9 @@ e_calendar_view_new_appointment (ECalendarView *cal_view)
 static void
 object_created_cb (CompEditor *ce, ECalendarView *cal_view)
 {
+#if 0  /* KILL-BONOBO */
 	gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_client (ce));
+#endif
 }
 
 static void
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 1d0b052440..76529d9533 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -111,7 +111,9 @@ 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
 }
 
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 8b73cd7ccf..03cffc9d93 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -467,8 +467,10 @@ e_day_view_class_init (EDayViewClass *class)
 	view_class->set_selected_time_range = e_day_view_set_selected_time_range;
 	view_class->get_visible_time_range = e_day_view_get_visible_time_range;
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_day_view */
  	e_day_view_a11y_init ();
+#endif
 }
 
 static void
@@ -5513,6 +5515,7 @@ 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 {
@@ -5526,12 +5529,14 @@ 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 {
@@ -5545,6 +5550,7 @@ 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
 }
 
 
@@ -6297,8 +6303,10 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 		if (!on_server) {
 			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
 				g_message (G_STRLOC ": Could not create the object!");
+#if 0  /* KILL-BONOBO */
 			else
 				gnome_calendar_emit_user_created_signal (day_view, e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view)), client);
+#endif
 
 			/* we remove the object since we either got the update from the server or failed */
 			e_day_view_remove_event_cb (day_view, day, event_num, NULL);
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index be69282a4a..322acc6676 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -91,8 +91,10 @@ 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
 }
 
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 3a5dd92e2f..6b9e43f581 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -225,8 +225,10 @@ e_week_view_class_init (EWeekViewClass *class)
 	view_class->set_selected_time_range = e_week_view_set_selected_time_range;
 	view_class->get_visible_time_range = e_week_view_get_visible_time_range;
 
+#if 0  /* KILL-BONOBO */
 	/* init the accessibility support for e_week_view */
 	e_week_view_a11y_init ();
+#endif
 }
 
 static void
@@ -3572,8 +3574,10 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 		if (!on_server) {
 			if (!e_cal_create_object (client, icalcomp, NULL, NULL))
 				g_message (G_STRLOC ": Could not create the object!");
+#if 0  /* KILL-BONOBO */
 			else
 				gnome_calendar_emit_user_created_signal (week_view, e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view)), client);
+#endif
 
 			/* we remove the object since we either got the update from the server or failed */
 			e_week_view_remove_event_cb (week_view, event_num, NULL);
@@ -3931,6 +3935,7 @@ e_week_view_cursor_key_right (EWeekView *week_view, GnomeCalendarViewType view_t
 static gboolean
 e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 {
+#if 0  /* KILL-BONOBO */
 	EWeekView *week_view;
 	ECal *ecal;
 	ECalModel *model;
@@ -4105,6 +4110,7 @@ e_week_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 		g_free (initial_text);
 
 	g_object_unref (comp);
+#endif
 
 	return TRUE;
 }
@@ -4187,6 +4193,7 @@ 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;
 
@@ -4202,6 +4209,7 @@ e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item)
 			return;
 		}
 	}
+#endif
 }
 
 static gboolean
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index f345bbb7df..14f9901a38 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -79,12 +79,14 @@ 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;
 	ECal *client;
 
 	client = gnome_calendar_get_default_client (dlg->gcal);
 	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,6 +95,7 @@ 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;
 	struct icaltimetype tt = icaltime_null_time ();
@@ -110,6 +113,7 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
 
 	gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
 	/* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
+#endif
 }
 
 /* Returns the current time, for the ECalendarItem. */
@@ -164,7 +168,9 @@ 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. */
@@ -209,6 +215,7 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 void
 goto_dialog (GnomeCalendar *gcal)
 {
+#if 0  /* KILL-BONOBO */
 	time_t start_time;
 	struct icaltimetype tt;
 	int b;
@@ -277,4 +284,5 @@ goto_dialog (GnomeCalendar *gcal)
 	g_object_unref (dlg->xml);
 	g_free (dlg);
 	dlg = NULL;
+#endif
 }
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 231067bf1f..67b2f729b0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -581,6 +581,7 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 		   int titleflags, time_t greystart, time_t greyend,
 		   int bordertitle)
 {
+#if 0  /* KILL-BONOBO */
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	PangoFontDescription *font, *font_bold, *font_normal;
 	time_t now, next;
@@ -705,6 +706,7 @@ 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 */
@@ -1241,6 +1243,7 @@ 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;
@@ -1359,6 +1362,7 @@ 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). */
@@ -1733,6 +1737,7 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 		    int 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;
@@ -1826,6 +1831,7 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	}
 	g_array_free (psi.events, TRUE);
 	g_array_free (spans, TRUE);
+#endif
 }
 
 
@@ -1957,6 +1963,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		    time_t start, time_t end,
 		    double left, double right, double top, double bottom)
 {
+#if 0  /* KILL-BONOBO */
 	PangoFontDescription *font_summary;
 	double y, yend, x, xend;
 	struct icaltimetype *tt;
@@ -2046,6 +2053,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 	}
 
 	pango_font_description_free (font_summary);
+#endif
 }
 
 static void
@@ -2380,6 +2388,7 @@ 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,12 +2403,14 @@ 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;
 
@@ -2419,6 +2430,7 @@ 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 */