Fixes #272301

2005-05-30  Thouis R. Jones  <thouis@csail.mit.edu>

	Fixes #272301

	* gui/apps_evolution_calendar.schemas.in.in:
	* gui/calendar-config-keys.h:
	* gui/calendar-config.c: (calendar_config_get_marcus_bains,
	calendar_config_add_notification_marcus_bains):
	* gui/calendar-config.h:
	* gui/e-day-view-config.c: (set_marcus_bains,
	marcus_bains_changed_cb, e_day_view_config_set_view):
	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw):
	* gui/e-day-view-time-item.c: (e_day_view_time_item_draw):
	* gui/e-day-view.c: (e_day_view_init, e_day_view_set_colors,
	e_day_view_get_show_marcus_bains, e_day_view_set_marcus_bains,
	e_day_view_update_marcus_bains):
	* gui/e-day-view.h:
	* gui/gnome-cal.c: (update_marcus_bains_line_cb, setup_widgets,
	gnome_calendar_destroy):  Added Marcus Bains Line to main item
	view and time bar.

svn path=/trunk/; revision=29426

1 files changed, 31 insertions, 1 deletions

diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 50d4d8eeea..b65d236bd1 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -355,6 +355,28 @@ time_divisions_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpo
 }
 
 static void
+set_marcus_bains (EDayView *day_view) 
+{
+	gboolean show_marcus_bains_line;
+	const char *dayview_color, *timebar_color;
+
+	calendar_config_get_marcus_bains (&show_marcus_bains_line, &dayview_color, &timebar_color);
+
+	e_day_view_set_marcus_bains (day_view, show_marcus_bains_line, dayview_color, timebar_color);
+}
+
+static void
+marcus_bains_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+{
+	EDayViewConfig *view_config = data;
+	EDayViewConfigPrivate *priv;
+	
+	priv = view_config->priv;
+	
+	set_marcus_bains (priv->view);
+}
+
+static void
 set_show_event_end (EDayView *day_view) 
 {
 	gboolean show_event_end;
@@ -379,7 +401,7 @@ void
 e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view) 
 {
 	EDayViewConfigPrivate *priv;
-	guint not;
+	guint not, not_1, not_2;
 	GList *l;
 	
 	g_return_if_fail (view_config != NULL);
@@ -458,6 +480,14 @@ e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view)
 	not = calendar_config_add_notification_time_divisions (time_divisions_changed_cb, view_config);
 	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
 
+	/* Showing Marcus Bains Line */
+	set_marcus_bains (day_view);
+
+	calendar_config_add_notification_marcus_bains (marcus_bains_changed_cb, view_config, &not, &not_1, &not_2);
+	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_1));
+	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_2));
+
 	/* Showing event end */
 	set_show_event_end (day_view);